search

medik8s / node-maintenance-operator

Kubernetes Operator to manage node maintenance through NodeMaintenance custom resources
https://www.medik8s.io/maintenance-node/
Apache License 2.0
28 stars 14 forks source link

Bump golang.org/x/net from 0.10.0 to 0.17.0 #95

Closed dependabot[bot] closed 11 months ago

dependabot[bot] commented 12 months ago

Bumps golang.org/x/net from 0.10.0 to 0.17.0.

Commits
  • b225e7c http2: limit maximum handler goroutines to MaxConcurrentStreams
  • 88194ad go.mod: update golang.org/x dependencies
  • 2b60a61 quic: fix several bugs in flow control accounting
  • 73d82ef quic: handle DATA_BLOCKED frames
  • 5d5a036 quic: handle streams moving from the data queue to the meta queue
  • 350aad2 quic: correctly extend peer's flow control window after MAX_DATA
  • 21814e7 quic: validate connection id transport parameters
  • a600b35 quic: avoid redundant MAX_DATA updates
  • ea63359 http2: check stream body is present on read timeout
  • ddd8598 quic: version negotiation
  • Additional commits viewable in compare view


Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/medik8s/node-maintenance-operator/network/alerts).
openshift-ci[bot] commented 12 months ago

Hi @dependabot[bot]. Thanks for your PR.

I'm waiting for a medik8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
razo7 commented 12 months ago

/ok-to-test

razo7 commented 12 months ago

/retest

razo7 commented 11 months ago

/approve /lgtm

openshift-ci[bot] commented 11 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dependabot[bot], razo7

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/medik8s/node-maintenance-operator/blob/main/OWNERS)~~ [razo7] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
razo7 commented 11 months ago

/cherry-pick release-0.16 /cherry-pick release-0.14

openshift-cherrypick-robot commented 11 months ago

@razo7: new pull request created: #96

In response to [this](https://github.com/medik8s/node-maintenance-operator/pull/95#issuecomment-1764202085): >/cherry-pick release-0.16 >/cherry-pick release-0.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
razo7 commented 11 months ago

/cherry-pick release-0.14

openshift-cherrypick-robot commented 11 months ago

@razo7: #95 failed to apply on top of branch "release-0.14":

Applying: Bump golang.org/x/net from 0.10.0 to 0.17.0
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/golang.org/x/net/html/render.go
M   vendor/golang.org/x/net/html/token.go
M   vendor/golang.org/x/net/http2/server.go
M   vendor/golang.org/x/net/http2/transport.go
M   vendor/golang.org/x/sys/unix/mkerrors.sh
M   vendor/golang.org/x/sys/unix/ptrace_darwin.go
M   vendor/golang.org/x/sys/unix/ptrace_ios.go
M   vendor/golang.org/x/sys/unix/syscall_aix.go
M   vendor/golang.org/x/sys/unix/syscall_bsd.go
M   vendor/golang.org/x/sys/unix/syscall_darwin.go
M   vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
M   vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
M   vendor/golang.org/x/sys/unix/syscall_dragonfly.go
M   vendor/golang.org/x/sys/unix/syscall_freebsd.go
M   vendor/golang.org/x/sys/unix/syscall_linux.go
M   vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
M   vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
M   vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
M   vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
M   vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/syscall_netbsd.go
M   vendor/golang.org/x/sys/unix/syscall_openbsd.go
M   vendor/golang.org/x/sys/unix/syscall_solaris.go
M   vendor/golang.org/x/sys/unix/syscall_unix.go
M   vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
M   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
M   vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
M   vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
M   vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
M   vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
M   vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
M   vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
M   vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
M   vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_linux.go
M   vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
M   vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
M   vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
M   vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
M   vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
M   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
M   vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
A   vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
A   vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
M   vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
M   vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_386.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
M   vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
M   vendor/golang.org/x/sys/windows/exec_windows.go
M   vendor/golang.org/x/sys/windows/service.go
M   vendor/golang.org/x/sys/windows/syscall_windows.go
M   vendor/golang.org/x/sys/windows/types_windows.go
M   vendor/golang.org/x/sys/windows/zsyscall_windows.go
M   vendor/golang.org/x/text/internal/language/compact/tables.go
M   vendor/golang.org/x/text/internal/language/tables.go
M   vendor/golang.org/x/text/language/match.go
M   vendor/golang.org/x/text/language/tables.go
M   vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
M   vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
Auto-merging vendor/golang.org/x/text/language/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/language/tables.go
Auto-merging vendor/golang.org/x/text/language/match.go
Auto-merging vendor/golang.org/x/text/internal/language/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/internal/language/tables.go
Auto-merging vendor/golang.org/x/text/internal/language/compact/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/internal/language/compact/tables.go
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/service.go
Auto-merging vendor/golang.org/x/sys/windows/exec_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/exec_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go deleted in HEAD and modified in Bump golang.org/x/net from 0.10.0 to 0.17.0. Version Bump golang.org/x/net from 0.10.0 to 0.17.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go deleted in HEAD and modified in Bump golang.org/x/net from 0.10.0 to 0.17.0. Version Bump golang.org/x/net from 0.10.0 to 0.17.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_unix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_solaris.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_openbsd.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_openbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_netbsd.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_netbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mkerrors.sh
Removing vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Removing vendor/golang.org/x/net/http2/Makefile
Removing vendor/golang.org/x/net/http2/Dockerfile
Auto-merging vendor/golang.org/x/net/html/token.go
Auto-merging vendor/golang.org/x/net/html/render.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump golang.org/x/net from 0.10.0 to 0.17.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/medik8s/node-maintenance-operator/pull/95#issuecomment-1764208244): >/cherry-pick release-0.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.