Skip to content

Bump to k8s 1.26.2 #1494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 57 commits into from
Mar 3, 2023
Merged

Conversation

sanchezl
Copy link

@sanchezl sanchezl commented Mar 1, 2023

  • Limit request retrying to []byte request bodies
  • Introducing LoadbalancerPortMapping flags for VipExternalIP
  • Release commit for Kubernetes v1.26.1-rc.0
  • Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0
  • Check the correct error in d.downloadAPIs
  • Deflake a preemption test that may patch Node incorrectly
  • Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669
  • Reduce load of Job integration test
  • fix double lock and excercise its codepath in tests
  • Improve error message when proxy connection fails
  • Fix SPDY proxy authentication with special chars
  • Fix a regression that scheduler always go through all Filter plugins
  • Windows Kube-Proxy implementation for internal traffic policy.
  • Resource claims should be a map type
  • Add .go-version file containing build go version
  • Add pod to dsw if termination is not completed during reconstruction #issues/113979
  • Fix clearing rate limiter in disruption controller
  • Fix issues in volumesnapshot test for ephemeral storage
  • Licensing: skip modules with fewer subdirs than mods
  • Update daemonSet status even if syncDaemonSet fails
  • Automated cherry pick of Removed the reverted changes from Changelogv1.26.md kubernetes/kubernetes#114602: Removed the reverted changes from Changelogv1.26.md
  • Cherry pick 114857 to release-1.26
  • Bump konnectivity-client to v0.0.35
  • expose prometheus.Registerer so that we can hook into this from external sources
  • egress_selector.go: register konnectivity-client metrics.
  • Adjust DisruptionTarget condition message to do not include preemptor pod metadata
  • Do not leak cross namespace pod metadata in preemption events
  • Improve vendor verification works for each staging repo
  • Exports WarningPrinter field in DeleteOptions
  • Explicitly call rand.Seed() method
  • Do not include scheduler name in the preemption event message
  • releng: Update images, dependencies and version to Go 1.19.5
  • pkg/controller/job: re-honor exponential backoff
  • PodGC should not add DisruptionTarget condition for pods which are in terminal phase
  • Fixes the issue [Flaky test] Tests in vendor/k8s.io/apiserver/pkg/server/genericapiserver_graceful_termination_test.go are flaking kubernetes/kubernetes#114145
  • Release commit for Kubernetes v1.26.1
  • Release commit for Kubernetes v1.26.2-rc.0
  • Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1
  • bump honnef.co/go/tools to support go1.20
  • Fix shadowing lint error
  • fix bug with param controllers being removed if used by more than one policy
  • k8s.io/component-base/logs: fix usage through Go flag package
  • k8s.io/component-base/logs: unit test for command line help output
  • k8s.io/component-base/logs: relax flagset unit tests
  • k8s.io/component-base/logs: match full help text in unit test
  • add custom dialer optimized for probes
  • use custom dialer for tcp probes
  • use custom dialer for http probes
  • Fix panic on ClusterIP allocation for /28 subnets
  • kubectl: use v2 for hpa
  • add scale test for probes
  • Fix nil pointer error in nodevolumelimits csi logging
  • Fix konnectivity-client metric registration.
  • Avoid typechecking stdlib
  • dynamic resource allocation: avoid apiserver complaint about list content
  • update prev succeeded indexes for indexed jobs unconditionally
  • apiserver: remove 34s from DELETECOLLECTION rest handler
  • Ignore container events with nil PodSandboxStatus
  • kubelet/client: collapse transport wiring onto standard approach
  • hack/tools: Bump golangci-lint version
  • *: Fix linter warnings
  • Enforce nodeName cannot be set along with non empty schedulingGates
  • Pin golang.org/x/net to v0.4.0 in 1.26
  • Update golang.org/x/net to v0.7.0
  • releng: Update images, dependencies and version to Go 1.19.6
  • Release commit for Kubernetes v1.26.2
  • Revert "UPSTREAM: 114770: Fix clearing rate limiter in disruption controller"
  • UPSTREAM: : hack/update-vendor.sh, make update and update image

mimowo and others added 30 commits January 16, 2023 11:14
…d-cherry-pick-of-#114940-upstream-release-1.26

Automated cherry pick of kubernetes#114940: Fixes the issue kubernetes#114145
api/v1.AddFlags only supports a pflag.FlagSet. The assumption was that code
which wants to use flag.FlagSet can use VisitAll to copy the flags. That works,
with one caveat: the flag.FlagSet help implementation will call String for the
zero value to determine whether the flag has a non-default value. This
currently leads to additional warnings at the end of the -help output:

     panic calling String method on zero v1.verbosityLevelPflag for flag v: runtime error: invalid memory address or nil pointer dereference
     panic calling String method on zero v1.vmoduleConfigurationPFlag for flag vmodule: runtime error: invalid memory address or nil pointer dereference

Supporting usage of methods with the zero value is good practice anyway and
thus gets added. This then avoids these panics.
Both pflag and standard FlagSet are covered.
A full string comparison might fail when the underlying libraries change how
they format the help text. A regex match is less strict, but still makes some
assumptions about the implementation.
The test was meant to fail when there are unexpected additional lines like the
"panic calling String method" messages. But `assert.Regexp` does a search for
the regexp, not a full string match, and thus succeeded even if those lines are
present. A full match needs to be requested explicitly with ^ and $.
…ck-of-#115129-upstream-release-1.26

Automated cherry pick of kubernetes#115129: bump honnef.co/go/tools to support go1.20
probe util dial set linger to 1s
Change-Id: I323b472606eaf3242b665022afe2a79ecf3b8358
The ClusterIP allocator tries to reserve on part of the ServiceCIDR
to allocate static IPs to the Services.

The heuristic of the allocator to obtain the offset was taking into
account the whole range size, not the IPs available in the range, the
subnet address and the broadcast address for IPv4 are not available.

This caused that for CIDRs with 16 hosts, /28 for IPv4 and /124 for
IPv6, the offset calculated was higher than the max number of available
addresses on the allocator, causing this to panic.

Change-Id: I6c6f527b0a600b3612be37769e405b8fb3dd33a8
Signed-off-by: Amir Alavi <[email protected]>
Change-Id: I1e49943531b569b5e02f82369750a9ca899ae726
…-of-#115322-upstream-release-1.26

Automated cherry pick of kubernetes#115322: Fix panic on ClusterIP allocation for /28 subnets
…k-of-#115056-upstream-release-1.26

Automated cherry pick of kubernetes#115056: PodGC should not add DisruptionTarget condition for pods
…herry-pick-of-#115143-upstream-release-1.26

Automated cherry pick of kubernetes#115143: add custom dialer optimized for probes
…tent

This fixes the following warning (error?) in the apiserver:

E0126 18:10:38.665239   16370 fieldmanager.go:210] "[SHOULD NOT HAPPEN] failed to update managedFields" err="failed to convert new object (test/claim-84; resource.k8s.io/v1alpha1, Kind=ResourceClaim) to smd typed: .status.reservedFor: element 0: associative list without keys has an element that's a map type" VersionKind="/, Kind=" namespace="test" name="claim-84"

The root cause is the same as in e50e8a0:
nothing in Kubernetes outright complains about a list of items where the item
type is comparable in Go, but not a simple type. This nonetheless isn't
supposed to be done in the API and can causes problems elsewhere.

For the ReservedFor field, everything seems to work okay except for the
warning. However, it's better to follow conventions and use a map. This is
possible in this case because UID is guaranteed to be a unique key.

Validation is now stricter than before, which is a good thing: previously,
two entries with the same UID were allowed as long as some other field was
different, which wasn't a situation that should have been allowed.
…ck-of-#115382-upstream-release-1.26

Automated cherry pick of kubernetes#115382: Avoid typechecking stdlib
@openshift-ci-robot
Copy link

@sanchezl: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@sanchezl sanchezl changed the title bump 1.26.2 Bump to k8s 1.26.2 Mar 1, 2023
@openshift-ci-robot
Copy link

@sanchezl: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci-robot
Copy link

@sanchezl: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

Copy link

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve
/remove-label backports/unvalidated-commits
/label backports/validated-commits

@soltysh
Copy link

soltysh commented Mar 2, 2023

/override ci/prow/verify-commits

@openshift-ci openshift-ci bot added backports/validated-commits Indicates that all commits come to merged upstream PRs. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Mar 2, 2023
@soltysh
Copy link

soltysh commented Mar 2, 2023

/retest-required

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 2, 2023
@soltysh
Copy link

soltysh commented Mar 2, 2023

/override ci/prow/verify-commits
this never passes on k8s bumps PR

@openshift-ci
Copy link

openshift-ci bot commented Mar 2, 2023

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/verify-commits

In response to this:

/override ci/prow/verify-commits

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Mar 2, 2023

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/verify-commits

In response to this:

/override ci/prow/verify-commits
this never passes on k8s bumps PR

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Mar 2, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sanchezl, soltysh

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 8cfbab7 and 2 for PR HEAD ed2f3d8 in total

@soltysh
Copy link

soltysh commented Mar 3, 2023

/override ci/prow/verify-commits

@soltysh
Copy link

soltysh commented Mar 3, 2023

/test e2e-aws-ovn-cgroupsv2
/test e2e-aws-ovn-crun

@openshift-ci
Copy link

openshift-ci bot commented Mar 3, 2023

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/verify-commits

In response to this:

/override ci/prow/verify-commits

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Mar 3, 2023

@sanchezl: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/4.11-upgrade-from-stable-4.10-e2e-aws-ovn-upgrade ed2f3d8 link false /test 4.11-upgrade-from-stable-4.10-e2e-aws-ovn-upgrade

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 8f93c35 into openshift:master Mar 3, 2023
@sanchezl
Copy link
Author

sanchezl commented Mar 3, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot

@sanchezl: #1494 failed to apply on top of branch "release-4.13":

Applying: PodGC should not add DisruptionTarget condition for pods which are in terminal phase
Applying: Fixes the issue #114145
Applying: Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1
Applying: bump honnef.co/go/tools to support go1.20
Applying: Fix shadowing lint error
Applying: fix bug with param controllers being removed if used by more than one policy
Applying: k8s.io/component-base/logs: fix usage through Go flag package
Applying: k8s.io/component-base/logs: unit test for command line help output
Applying: k8s.io/component-base/logs: relax flagset unit tests
Applying: k8s.io/component-base/logs: match full help text in unit test
Applying: add custom dialer optimized for probes
Applying: use custom dialer for tcp probes
Applying: use custom dialer for http probes
Applying: Fix panic on ClusterIP allocation for /28 subnets
Applying: kubectl: use v2 for hpa
Applying: add scale test for probes
Applying: Fix nil pointer error in nodevolumelimits csi logging
Applying: Fix konnectivity-client metric registration.
Applying: Avoid typechecking stdlib
Applying: dynamic resource allocation: avoid apiserver complaint about list content
Applying: update prev succeeded indexes for indexed jobs unconditionally
Applying: apiserver: remove 34s from DELETECOLLECTION rest handler
Applying: Ignore container events with nil PodSandboxStatus
Applying: kubelet/client: collapse transport wiring onto standard approach
Applying: hack/tools: Bump golangci-lint version
Applying: *: Fix linter warnings
Applying: Enforce nodeName cannot be set along with non empty schedulingGates
Applying: Pin golang.org/x/net to v0.4.0 in 1.26
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/src/k8s.io/api/go.mod
M	staging/src/k8s.io/api/go.sum
M	staging/src/k8s.io/apiextensions-apiserver/go.mod
M	staging/src/k8s.io/apiextensions-apiserver/go.sum
M	staging/src/k8s.io/apimachinery/go.mod
M	staging/src/k8s.io/apimachinery/go.sum
M	staging/src/k8s.io/apiserver/go.mod
M	staging/src/k8s.io/apiserver/go.sum
M	staging/src/k8s.io/cli-runtime/go.mod
M	staging/src/k8s.io/cli-runtime/go.sum
M	staging/src/k8s.io/client-go/go.mod
M	staging/src/k8s.io/client-go/go.sum
M	staging/src/k8s.io/cloud-provider/go.mod
M	staging/src/k8s.io/cloud-provider/go.sum
M	staging/src/k8s.io/cluster-bootstrap/go.mod
M	staging/src/k8s.io/cluster-bootstrap/go.sum
M	staging/src/k8s.io/code-generator/examples/go.sum
M	staging/src/k8s.io/code-generator/go.mod
M	staging/src/k8s.io/code-generator/go.sum
M	staging/src/k8s.io/component-base/go.mod
M	staging/src/k8s.io/component-base/go.sum
M	staging/src/k8s.io/component-helpers/go.mod
M	staging/src/k8s.io/component-helpers/go.sum
M	staging/src/k8s.io/controller-manager/go.mod
M	staging/src/k8s.io/controller-manager/go.sum
M	staging/src/k8s.io/cri-api/go.mod
M	staging/src/k8s.io/cri-api/go.sum
M	staging/src/k8s.io/csi-translation-lib/go.mod
M	staging/src/k8s.io/csi-translation-lib/go.sum
M	staging/src/k8s.io/dynamic-resource-allocation/go.mod
M	staging/src/k8s.io/dynamic-resource-allocation/go.sum
M	staging/src/k8s.io/kms/go.mod
M	staging/src/k8s.io/kms/go.sum
M	staging/src/k8s.io/kube-aggregator/go.mod
M	staging/src/k8s.io/kube-aggregator/go.sum
M	staging/src/k8s.io/kube-controller-manager/go.mod
M	staging/src/k8s.io/kube-controller-manager/go.sum
M	staging/src/k8s.io/kube-proxy/go.mod
M	staging/src/k8s.io/kube-proxy/go.sum
M	staging/src/k8s.io/kube-scheduler/go.mod
M	staging/src/k8s.io/kube-scheduler/go.sum
M	staging/src/k8s.io/kubectl/go.mod
M	staging/src/k8s.io/kubectl/go.sum
M	staging/src/k8s.io/kubelet/go.mod
M	staging/src/k8s.io/kubelet/go.sum
M	staging/src/k8s.io/legacy-cloud-providers/go.mod
M	staging/src/k8s.io/legacy-cloud-providers/go.sum
M	staging/src/k8s.io/metrics/go.mod
M	staging/src/k8s.io/metrics/go.sum
M	staging/src/k8s.io/pod-security-admission/go.mod
M	staging/src/k8s.io/pod-security-admission/go.sum
M	staging/src/k8s.io/sample-apiserver/go.mod
M	staging/src/k8s.io/sample-apiserver/go.sum
M	staging/src/k8s.io/sample-cli-plugin/go.mod
M	staging/src/k8s.io/sample-cli-plugin/go.sum
M	staging/src/k8s.io/sample-controller/go.mod
M	staging/src/k8s.io/sample-controller/go.sum
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 staging/src/k8s.io/sample-controller/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-controller/go.sum
Auto-merging staging/src/k8s.io/sample-controller/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-controller/go.mod
Auto-merging staging/src/k8s.io/sample-cli-plugin/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-cli-plugin/go.sum
Auto-merging staging/src/k8s.io/sample-cli-plugin/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-cli-plugin/go.mod
Auto-merging staging/src/k8s.io/sample-apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-apiserver/go.sum
Auto-merging staging/src/k8s.io/sample-apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-apiserver/go.mod
Auto-merging staging/src/k8s.io/pod-security-admission/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/pod-security-admission/go.sum
Auto-merging staging/src/k8s.io/pod-security-admission/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/pod-security-admission/go.mod
Auto-merging staging/src/k8s.io/metrics/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/metrics/go.sum
Auto-merging staging/src/k8s.io/metrics/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/metrics/go.mod
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.sum
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.mod
Auto-merging staging/src/k8s.io/kubelet/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubelet/go.sum
Auto-merging staging/src/k8s.io/kubelet/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubelet/go.mod
Auto-merging staging/src/k8s.io/kubectl/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.sum
Auto-merging staging/src/k8s.io/kubectl/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.mod
Auto-merging staging/src/k8s.io/kube-scheduler/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-scheduler/go.sum
Auto-merging staging/src/k8s.io/kube-scheduler/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-scheduler/go.mod
Auto-merging staging/src/k8s.io/kube-proxy/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-proxy/go.sum
Auto-merging staging/src/k8s.io/kube-proxy/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-proxy/go.mod
Auto-merging staging/src/k8s.io/kube-controller-manager/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-controller-manager/go.sum
Auto-merging staging/src/k8s.io/kube-controller-manager/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-controller-manager/go.mod
Auto-merging staging/src/k8s.io/kube-aggregator/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-aggregator/go.sum
Auto-merging staging/src/k8s.io/kube-aggregator/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-aggregator/go.mod
Auto-merging staging/src/k8s.io/kms/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kms/go.sum
Auto-merging staging/src/k8s.io/kms/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kms/go.mod
Auto-merging staging/src/k8s.io/dynamic-resource-allocation/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/dynamic-resource-allocation/go.sum
Auto-merging staging/src/k8s.io/dynamic-resource-allocation/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/dynamic-resource-allocation/go.mod
Auto-merging staging/src/k8s.io/csi-translation-lib/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/csi-translation-lib/go.sum
Auto-merging staging/src/k8s.io/csi-translation-lib/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/csi-translation-lib/go.mod
Auto-merging staging/src/k8s.io/cri-api/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cri-api/go.sum
Auto-merging staging/src/k8s.io/cri-api/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cri-api/go.mod
Auto-merging staging/src/k8s.io/controller-manager/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.sum
Auto-merging staging/src/k8s.io/controller-manager/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.mod
Auto-merging staging/src/k8s.io/component-helpers/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/component-helpers/go.sum
Auto-merging staging/src/k8s.io/component-helpers/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/component-helpers/go.mod
Auto-merging staging/src/k8s.io/component-base/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/component-base/go.sum
Auto-merging staging/src/k8s.io/component-base/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/component-base/go.mod
Auto-merging staging/src/k8s.io/code-generator/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/code-generator/go.sum
Auto-merging staging/src/k8s.io/code-generator/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/code-generator/go.mod
Auto-merging staging/src/k8s.io/code-generator/examples/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/code-generator/examples/go.sum
Auto-merging staging/src/k8s.io/cluster-bootstrap/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cluster-bootstrap/go.sum
Auto-merging staging/src/k8s.io/cluster-bootstrap/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cluster-bootstrap/go.mod
Auto-merging staging/src/k8s.io/cloud-provider/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.sum
Auto-merging staging/src/k8s.io/cloud-provider/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.mod
Auto-merging staging/src/k8s.io/client-go/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/client-go/go.sum
Auto-merging staging/src/k8s.io/client-go/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/client-go/go.mod
Auto-merging staging/src/k8s.io/cli-runtime/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.sum
Auto-merging staging/src/k8s.io/cli-runtime/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.mod
Auto-merging staging/src/k8s.io/apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.sum
Auto-merging staging/src/k8s.io/apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.mod
Auto-merging staging/src/k8s.io/apimachinery/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apimachinery/go.sum
Auto-merging staging/src/k8s.io/apimachinery/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apimachinery/go.mod
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.sum
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.mod
Auto-merging staging/src/k8s.io/api/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.sum
Auto-merging staging/src/k8s.io/api/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.mod
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 0028 Pin golang.org/x/net to v0.4.0 in 1.26
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:

/cherry-pick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backports/validated-commits Indicates that all commits come to merged upstream PRs. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.