From 2e5b79c08957bf5979cbf42179e2c671788af2f1 Mon Sep 17 00:00:00 2001 From: "microshift-rebase-script[bot]" <114237296+microshift-rebase-script[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 08:04:40 +0000 Subject: [PATCH] NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-06-092713_amd64-2025-02-06_arm64-2025-02-06 (#4521) * update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot --- Makefile.kube_git.var | 4 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 2 +- .../release-olm-aarch64.json | 2 +- .../release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 4 +- etcd/go.mod | 62 +++++----- etcd/go.sum | 28 ++--- etcd/vendor/modules.txt | 76 ++++++------ go.mod | 62 +++++----- go.sum | 104 ++++++++-------- .../crio.conf.d/10-microshift_amd64.conf | 2 +- scripts/auto-rebase/changelog.txt | 29 +++-- scripts/auto-rebase/commits.txt | 6 +- scripts/auto-rebase/last_rebase.sh | 2 +- .../etcd3/etcd3retry/retry_etcdclient.go | 82 ++++++++++--- .../factory/retry_etcdprobemonitor.go | 4 +- vendor/k8s.io/kubelet/config/v1beta1/types.go | 2 + .../statefulset/stateful_set_control.go | 2 +- .../kubernetes/pkg/features/kube_features.go | 3 +- .../generated/openapi/zz_generated.openapi.go | 2 +- .../pkg/kubelet/apis/config/types.go | 2 + .../pkg/kubelet/kubelet_server_journal.go | 3 +- .../kubelet/kubelet_server_journal_linux.go | 12 +- .../kubelet/kubelet_server_journal_others.go | 4 +- .../kubelet/kubelet_server_journal_windows.go | 99 ++++++++++++--- .../cache/actual_state_of_world.go | 17 +++ .../reconciler/reconciler_common.go | 5 + .../pkg/volume/util/device_util_linux.go | 7 +- vendor/modules.txt | 114 +++++++++--------- 33 files changed, 453 insertions(+), 298 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 58f054f656f..b83891cb4e2 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=31 -KUBE_GIT_VERSION=v1.31.4 -KUBE_GIT_COMMIT=5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 +KUBE_GIT_VERSION=v1.31.5 +KUBE_GIT_COMMIT=acb9630c20d2fa0d11bad4c38c7b28e2db9d818b KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 51e9c1a5216..e6e35a5a93a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-05-235102 +OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-06-191241 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 466e8850dd2..d404ef978bd 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2025-02-05-033447 +OCP_VERSION := 4.18.0-0.nightly-2025-02-06-092713 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index c86888630f9..266fe9d0075 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-02-05-235102" + "base": "4.18.0-0.nightly-arm64-2025-02-06-191241" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 3aed58eb1df..b3b858c3a98 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2025-02-05-033447" + "base": "4.18.0-0.nightly-2025-02-06-092713" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 97189faab81..7927ff3498c 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-02-05-235102" + "base": "4.18.0-0.nightly-arm64-2025-02-06-191241" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 642f366e524..99fb3d6c2d1 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2025-02-05-033447" + "base": "4.18.0-0.nightly-2025-02-06-092713" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e4e42fb7df0..36fd4d84074 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-02-05-235102" + "base": "4.18.0-0.nightly-arm64-2025-02-06-191241" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0730b0c09e2f2e0a25a9b7bd65f2ecf65012465124b87ffdcbf6cd847a3ed8d0", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 772d84f734d..b3fcea57dea 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2025-02-05-033447" + "base": "4.18.0-0.nightly-2025-02-06-092713" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35512335ac39aed0f55b7f799f416f4f6445c20c1b19888cf2bb72bb276703f2", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe009d03910e18795e3bd60a3fd84938311d464d2730a2af5ded5b24e4d05a6b", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:242b3d66438c42745f4ef318bdeaf3d793426f12962a42ea83e18d06c08aaf09", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f7093ff0639c463f8c9ac05be7fcd27f7dd756adf29ec2202e667b29942746b", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eafc90ff79ad4b3a77db747b7f8e010822f895fcebcaee69ac8e0e5937bbb397", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33549946e22a9ffa738fd94b1345f90921bc8f92fa6137784cb33c77ad806f9d", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898cae57123c5006d397b24af21b0f24a0c42c9b0be5ee8251e1824711f65820", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d38bd1b30905149a8ec481e37ddb8812e9ea66b25333a80f08f09c467b805a39" diff --git a/etcd/go.mod b/etcd/go.mod index 72c15ef9d07..cf13e4b0a2c 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -151,37 +151,37 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 68ab9453391..0087d73c0a2 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -190,20 +190,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a h1:P1hNaY github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:uapEfOMPaJ45CqBYIraLO5+fqyIY2d57nFfxzFwy4D4= github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a h1:X7PFfxZQaHmXUDLIo+und9jejO3yFwWIdR+m1nvSnww= github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:40sqgtGt6ZJNKm8nk8x6LexZakPu+NDl/DCgZTZ69Cc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 h1:69tfONLx08TSlXI9l2xbaaQV4Wo+YLbkSLoHIpM1b14= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 h1:e2Jk97MIRH08IqMOmcwnSM+CNPODPYRIzMfjuWnW1jo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 h1:XD1MYiv0huDCAzG+3Zhkz0ZEibeqmnSNbdNZ+JoRssU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 h1:3ZOaqif14diNJWK2ab7U608XhoGMV0T7Wh0Bx+q12mY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 h1:1ZESnaUKuQUIoa6/xEFEgXbPZzumxgoALyNs2oeeU4c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 h1:7Lf0CqVjgLK5TkUIY5lWPIKyIm9nFrbvBNSWD3yg2Qs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 h1:nQoS4AaKWW2dh2A90dcN8ehQqhnI3w/D8pP2r/eVddE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 h1:NKKnDnjBw+Ammng9JV7YTH9vFwCpKZLtzJ5Srx3/lII= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 h1:xOBKhbmWQ3qtSFG5g73+n+tV7KRNxNawm8b7IDmb0rU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 h1:Tx6q1i3/SZO5Os0PHvHn+mRohgCZhy/jcj8LuxaoGcY= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 h1:MSJV8egWdnoXWR6LHjFgEFwPvceQ1MAF4K6Ee9VPK00= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 h1:Q8XYRJNCJDQ7kzPqHrhL+gY6X3EXmYSrufcz5S6qF9I= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 h1:jr+/VdoZrkF+jpe4+iXDdS7CwFxkgEE8rS0lA8YT67k= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 h1:f41GXBnBP4QdK+Fd+TS5bfr2osPIawLOa92JuLQcOxY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index ad380eb947b..674aabf65f1 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -625,7 +625,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -685,7 +685,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -745,17 +745,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -910,7 +910,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -947,7 +947,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1075,34 +1075,34 @@ sigs.k8s.io/yaml/goyaml.v3 # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2 diff --git a/go.mod b/go.mod index ec80b5793dc..242623f5670 100644 --- a/go.mod +++ b/go.mod @@ -215,35 +215,35 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250204204913-5f71ced928d0 // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250204204913-5f71ced928d0 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250204204913-5f71ced928d0 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250205072427-acb9630c20d2 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250205072427-acb9630c20d2 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250205072427-acb9630c20d2 // from kubernetes ) replace ( @@ -254,6 +254,6 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2 // staging kubernetes diff --git a/go.sum b/go.sum index c22a85cdfe1..5bcf82c903d 100644 --- a/go.sum +++ b/go.sum @@ -361,60 +361,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a h1:Tza8C8nqjPxgPL7ft/tYAMm8/thQ2zA3v9BrYubvbJs= github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo= -github.com/openshift/kubernetes v0.0.0-20250204204913-5f71ced928d0 h1:BsGIFDRkTjGeV5Ffo2Azo8jp6kD5DuZ8oMdNODUkCtI= -github.com/openshift/kubernetes v0.0.0-20250204204913-5f71ced928d0/go.mod h1:2x+thMKQZfKItFccUQDLbzbMOQRT8VJSPZV+nQsw2DM= +github.com/openshift/kubernetes v0.0.0-20250205072427-acb9630c20d2 h1:MT3cQefB2Js4AJJd6VZSChppEtusK05ml2Xxky4c0ag= +github.com/openshift/kubernetes v0.0.0-20250205072427-acb9630c20d2/go.mod h1:2x+thMKQZfKItFccUQDLbzbMOQRT8VJSPZV+nQsw2DM= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d h1:rnYg1QgPmhuRhyEILvhh20Cmc08ohEwLjMj8oSUBZk8= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 h1:69tfONLx08TSlXI9l2xbaaQV4Wo+YLbkSLoHIpM1b14= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 h1:D9gI1hJZRMJ7SbERNC1CX3HmFgGG9rOIj0qMUkSXzHo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0/go.mod h1:/sTRSdwBpWA0hmURh+C5JWYCIthJyMW1n6aBBT49azk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 h1:e2Jk97MIRH08IqMOmcwnSM+CNPODPYRIzMfjuWnW1jo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 h1:XD1MYiv0huDCAzG+3Zhkz0ZEibeqmnSNbdNZ+JoRssU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 h1:3ZOaqif14diNJWK2ab7U608XhoGMV0T7Wh0Bx+q12mY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 h1:1ZESnaUKuQUIoa6/xEFEgXbPZzumxgoALyNs2oeeU4c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 h1:h3ZUQDlEf4bS3iIyFgnXosxlA5LgrETdUTlRIykq+eg= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0/go.mod h1:quuMw5yefUpYWy/wwj3gVzv1d278qZ955vgdf0KoMaQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 h1:FK4qHjW6/yL16mq41T0igJeHhRw0pVtctYB5aCmCpQg= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 h1:7Lf0CqVjgLK5TkUIY5lWPIKyIm9nFrbvBNSWD3yg2Qs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 h1:AuCN+j8hxJAF2es9zShfPunHpHIEBg8z5TW9lK2OcTU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 h1:BtmLcP8y2Eig6ix8dhiaPhG0QlenBKFsNNoxUefNn1o= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0/go.mod h1:iFvmLS5dWasxkIgw+BNG/VbuFSUxyQGcGF521EN9B/I= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 h1:EGitn3Q5VDvUDXczwPz2neng+QCrcgsAOxeObgTBdRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0/go.mod h1:YpEDCYwaFGuuH5G6cKM2zbgDSvm702C+9Md5rMWNnZU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 h1:cfwzE4Phx000WHXjguU55oVZt5X7Y3goe8TQvSVVg7Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0/go.mod h1:j3wMbaWkfpRosgrcMI2zpGLdkvkvHBl2hw80Khk8jGc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 h1:4pcGgXcYrhVHJSH6374aJLX5v98dUgnAdAxpKugHtgk= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 h1:RUhm38Ze52PoNDgowxajQ3GuzizJA+KIKkw/uGkSpwA= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0/go.mod h1:9EG+cylLe3BInQjd8n7/hBaNIG5joc2kmKoNjiVNUoI= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 h1:eo/3ykJN5CSEg63SYmCwHPHt0aGOx5f0OnE7Dt2doak= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 h1:1j1w5E9zIw6Q+1nfHCluXcF/MNcWnIoHrx1ZW61QjXA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0/go.mod h1:L2WZmob8WSvOMeeYPs2VQngSwpwJpGRRYF8wQDWpk+0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 h1:TJM5zS0244YPkp/PdLmvNbmnQkbvKcE/Itw9v/xSwiU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0/go.mod h1:TT8OLzB/mlUE8ZEJAY/kd4j/Yu6QQN6VWMP305VCbQ0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 h1:36aNNjmSg69pfFJ7qODiJ9ETxqtAVUWczAR6S0s+QlE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 h1:PjfP/pehsLmoQgt4dczcMJAMueTMFKMqlzWSqV8xO20= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 h1:nQoS4AaKWW2dh2A90dcN8ehQqhnI3w/D8pP2r/eVddE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 h1:c/9zw68No5U32+cOjp5mQup8885aRE+BqHVZVKoasVs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0/go.mod h1:aba+hw0aVr0RPzXhBLxs7UIkV9VyxfpiN7U4zpSUWzM= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 h1:la4EVRxTXeJxeteSikLZyzqMZ5mEzglkS3wyo+xInbQ= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 h1:ocN7I4/6vQG6YOvLGaeoqgQwhiRFX5SOIJVOPl2NcTA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 h1:/zFcQp+TDNUO/MAWbN0bd2+wrP3cIggA/mZY3+N9tCc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0/go.mod h1:lYnh13syOSXUO+zZ78dh+6nRbwmNbg8fzzkFxQvdYr4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 h1:NKKnDnjBw+Ammng9JV7YTH9vFwCpKZLtzJ5Srx3/lII= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 h1:4JCBXuxqSsbS3X7Km91+8+V8+6K10ZIdrwNt5zn+9Rc= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2/go.mod h1:/sTRSdwBpWA0hmURh+C5JWYCIthJyMW1n6aBBT49azk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 h1:xOBKhbmWQ3qtSFG5g73+n+tV7KRNxNawm8b7IDmb0rU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 h1:Tx6q1i3/SZO5Os0PHvHn+mRohgCZhy/jcj8LuxaoGcY= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 h1:MSJV8egWdnoXWR6LHjFgEFwPvceQ1MAF4K6Ee9VPK00= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 h1:Q8XYRJNCJDQ7kzPqHrhL+gY6X3EXmYSrufcz5S6qF9I= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 h1:nfpvkLi+uMN49fh8XEJ5piuJ5DNJTXOhnlAfAoqkcqo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2/go.mod h1:quuMw5yefUpYWy/wwj3gVzv1d278qZ955vgdf0KoMaQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 h1:da7KzSHvHtW5HScMVu7O1CqHPESk5mFkMnn+VCKb/nE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 h1:jr+/VdoZrkF+jpe4+iXDdS7CwFxkgEE8rS0lA8YT67k= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 h1:d6cXNnd9yBZN17WYMv8BbWsrQcsP6rTmtPzsS1i7rsA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 h1:fkrtdpBSD0cpdLuZLl41gT6jgqRZZJEfM0JUaD2AGd4= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2/go.mod h1:iFvmLS5dWasxkIgw+BNG/VbuFSUxyQGcGF521EN9B/I= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 h1:+dKp2ezl2wjzBVROg6D8SOBTq99/yBItZz4ldeBu3Xc= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2/go.mod h1:YpEDCYwaFGuuH5G6cKM2zbgDSvm702C+9Md5rMWNnZU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2 h1:+77L+cDpBteM8ReKJg1k/aSztKaH8m52okkJmVvXK4w= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2/go.mod h1:j3wMbaWkfpRosgrcMI2zpGLdkvkvHBl2hw80Khk8jGc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 h1:H0zcb0qlLWVbTLzQyU/owBYwWv6n41SC76ZT0+EFXIg= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 h1:dw/ADh3ANFfXwAfi/iz/4qYd5fPgNho9pg5FyO/QPUY= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2/go.mod h1:9EG+cylLe3BInQjd8n7/hBaNIG5joc2kmKoNjiVNUoI= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 h1:FVq2XTlKBaQU4AMtI0OiWvcEj2zM7Nj3RPLOUKq7Hnw= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 h1:2+4numYLC7JsYdYiGnEK16Fv0cVEz+cb/ugZyeAz/Es= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2/go.mod h1:L2WZmob8WSvOMeeYPs2VQngSwpwJpGRRYF8wQDWpk+0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 h1:M0swVYGE05YuwUtxsBHToZD+bDD+jWpTGDj+J713K4I= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2/go.mod h1:TT8OLzB/mlUE8ZEJAY/kd4j/Yu6QQN6VWMP305VCbQ0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 h1:gSjxjQSEIUgQQWj78lns0sXBTIuWju0BPocGUUARFnc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 h1:qQumyEHDqTeOwrDljD2V9WV7PnbiHKomsHBtpWAevas= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 h1:f41GXBnBP4QdK+Fd+TS5bfr2osPIawLOa92JuLQcOxY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 h1:dtrPGfsufumnlIKKa97qj9KxWPB+Qnh5bmZnMcdKBQ4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2/go.mod h1:aba+hw0aVr0RPzXhBLxs7UIkV9VyxfpiN7U4zpSUWzM= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 h1:b9Gs2I3EcKqYClu5NZfSQl1PiLR3JkHNhyMdlEucjf8= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 h1:iGoOxnsiuBDsauWrknBFYcUmhO5jvfC1dqRNWfFwpD4= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 h1:P4z/BQ252luhyDK/eW/ojH4EuwJ3IUbE/Qi9zvW3f4I= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2/go.mod h1:lYnh13syOSXUO+zZ78dh+6nRbwmNbg8fzzkFxQvdYr4= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 19e1fc3daad..63ed0537cbf 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eafc90ff79ad4b3a77db747b7f8e010822f895fcebcaee69ac8e0e5937bbb397" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33549946e22a9ffa738fd94b1345f90921bc8f92fa6137784cb33c77ad806f9d" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index b698b4b3d3f..c036afb9364 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,16 +1,23 @@ -- api embedded-component a32333aa93b82932556b6adb1590490220abe10c to 3175f3026f905a311fa0a462afce2393c42d7f87 - - 6c554f1 2025-01-13T13:16:45+01:00 ipam, virt: graduate persistent ips feature gate to GA +- cluster-csi-snapshot-controller-operator embedded-component 46902b494ed0a608a48d2a04faf6e4ed2f9a6a5b to 6fe700087e8be6513285edd18f461790fecc65c3 + - 0133119 2025-02-04T16:54:45+00:00 Support HCP labels -- cluster-network-operator embedded-component 224efe3703ae1b01eeb815d9db6dd5ccc445feff to e98cac9c69c0cdf0a08c3a6f688c11dae2ac7d93 - - db58526 2025-02-01T05:09:39+00:00 Fix UDN and CUDN hostSubnet validation - -- kubernetes embedded-component ff3bcb85459e1c94917fbde7c4528c644b09ca2a to 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 - - ff471cba8 2025-02-03T19:37:30+00:00 UPSTREAM: : log only deprecated api requests - -- kubernetes image-amd64 ff3bcb85459e1c94917fbde7c4528c644b09ca2a to 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 - - ff471cba8 2025-02-03T19:37:30+00:00 UPSTREAM: : log only deprecated api requests +- kubernetes embedded-component 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 to acb9630c20d2fa0d11bad4c38c7b28e2db9d818b + - 0c68a455f 2025-02-04T11:31:24-05:00 UPSTREAM: : Don't retry storage calls with side effects. + - d2d1c4138 2025-01-20T17:13:16+01:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 79b096c6b 2025-01-20T17:13:16+01:00 UPSTREAM: : manually resolve conflicts + - af64d838a 2025-01-15T14:32:36+00:00 Release commit for Kubernetes v1.31.5 + - c94919d68 2025-01-13T14:46:05-08:00 kubelet: use env vars in node log query PS command + - 774adff44 2025-01-06T15:08:09-08:00 webhook: alter regex to account for x509sha1 GODEBUG removal + - ec1a3974b 2025-01-02T15:01:34+02:00 kubeadm: fix a bug where the node.skipPhases in UpgradeNodeConfiguration is not respected by 'kubeadm upgrade node' + - eb8c23995 2024-12-30T09:13:26+01:00 Bump images, dependencies and versions to go 1.22.10 and distroless iptables + - b82572f6f 2024-12-20T10:03:38+03:00 Do not attempt to truncate revision history if revisionHistoryLimit is negative + - 1f830174c 2024-12-18T19:47:41+01:00 fetch cni plugins from GitHub releases + - b555e6b2a 2024-12-16T10:40:28-05:00 Fix volume expansion offline + - b8265e785 2024-12-12T15:59:00+01:00 prevent unnecessary resolving of iscsi/fc devices to dm + - fd78b5296 2024-12-10T11:57:04+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.4 + - 04f5b2038 2024-12-03T09:47:51+08:00 kubelet: Fix the volume manager did't check the device mount state in the actual state of the world before marking the volume as detached. It may cause a pod to be stuck in the Terminating state due to the above issue when it was deleted. -- kubernetes image-arm64 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 to acb9630c20d2fa0d11bad4c38c7b28e2db9d818b +- kubernetes image-amd64 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 to acb9630c20d2fa0d11bad4c38c7b28e2db9d818b - 0c68a455f 2025-02-04T11:31:24-05:00 UPSTREAM: : Don't retry storage calls with side effects. - d2d1c4138 2025-01-20T17:13:16+01:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - 79b096c6b 2025-01-20T17:13:16+01:00 UPSTREAM: : manually resolve conflicts diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d5bee0287cc..9c0705ff868 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,5 +1,5 @@ https://github.com/openshift/api embedded-component 3175f3026f905a311fa0a462afce2393c42d7f87 -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 46902b494ed0a608a48d2a04faf6e4ed2f9a6a5b +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 6fe700087e8be6513285edd18f461790fecc65c3 https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224 https://github.com/openshift/cluster-ingress-operator embedded-component 8be174945db79b0660bd0fd21ed279ab7b6aafbf https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a77db53429b161c62ea284b9d91f2c47fd0c525c @@ -10,7 +10,7 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component 838d2484157f076bbb81f1b584898aec6f051c2f https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb -https://github.com/openshift/kubernetes embedded-component 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 +https://github.com/openshift/kubernetes embedded-component acb9630c20d2fa0d11bad4c38c7b28e2db9d818b https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73 https://github.com/openshift/machine-config-operator embedded-component d6090f11285d3b9a9262290f17bc3f90eb3dd8e5 https://github.com/openshift/openshift-controller-manager embedded-component 5bfc8081a65ea3e0d23306c0398143a9987d659e @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f07 https://github.com/openshift/router image-amd64 061909a4c397c048e6def163fda5d227c75f176b https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2 https://github.com/openshift/ovn-kubernetes image-amd64 5086614cde9fbec2cce4c8184ea407adaef5c2a3 -https://github.com/openshift/kubernetes image-amd64 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 +https://github.com/openshift/kubernetes image-amd64 acb9630c20d2fa0d11bad4c38c7b28e2db9d818b https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-arm64 a50d4c0e41a6eff7aafe21dbe564359a0b622bb1 https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b720e246a6a..72bd6179f6d 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-02-05-033447" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-05-235102" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-02-06-092713" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-06-191241" diff --git a/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go b/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go index 86d51342630..b56fd2084c0 100644 --- a/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go +++ b/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go @@ -2,6 +2,9 @@ package etcd3retry import ( "context" + "fmt" + "regexp" + "strings" "time" etcdrpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" @@ -36,7 +39,7 @@ func NewRetryingEtcdStorage(delegate storage.Interface) storage.Interface { // in seconds (0 means forever). If no error is returned and out is not nil, out will be // set to the read value from database. func (c *retryClient) Create(ctx context.Context, key string, obj, out runtime.Object, ttl uint64) error { - return OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + return OnError(ctx, DefaultRetry, IsRetriableErrorOnWrite, func() error { return c.Interface.Create(ctx, key, obj, out, ttl) }) } @@ -44,7 +47,7 @@ func (c *retryClient) Create(ctx context.Context, key string, obj, out runtime.O // Delete removes the specified key and returns the value that existed at that spot. // If key didn't exist, it will return NotFound storage error. func (c *retryClient) Delete(ctx context.Context, key string, out runtime.Object, preconditions *storage.Preconditions, validateDeletion storage.ValidateObjectFunc, cachedExistingObject runtime.Object) error { - return OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + return OnError(ctx, DefaultRetry, IsRetriableErrorOnWrite, func() error { return c.Interface.Delete(ctx, key, out, preconditions, validateDeletion, cachedExistingObject) }) } @@ -58,7 +61,7 @@ func (c *retryClient) Delete(ctx context.Context, key string, out runtime.Object // and send it in an "ADDED" event, before watch starts. func (c *retryClient) Watch(ctx context.Context, key string, opts storage.ListOptions) (watch.Interface, error) { var ret watch.Interface - err := OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + err := OnError(ctx, DefaultRetry, IsRetriableErrorOnRead, func() error { var innerErr error ret, innerErr = c.Interface.Watch(ctx, key, opts) return innerErr @@ -72,7 +75,7 @@ func (c *retryClient) Watch(ctx context.Context, key string, opts storage.ListOp // The returned contents may be delayed, but it is guaranteed that they will // match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'. func (c *retryClient) Get(ctx context.Context, key string, opts storage.GetOptions, objPtr runtime.Object) error { - return OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + return OnError(ctx, DefaultRetry, IsRetriableErrorOnRead, func() error { return c.Interface.Get(ctx, key, opts, objPtr) }) } @@ -84,7 +87,7 @@ func (c *retryClient) Get(ctx context.Context, key string, opts storage.GetOptio // The returned contents may be delayed, but it is guaranteed that they will // match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'. func (c *retryClient) GetList(ctx context.Context, key string, opts storage.ListOptions, listObj runtime.Object) error { - return OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + return OnError(ctx, DefaultRetry, IsRetriableErrorOnRead, func() error { return c.Interface.GetList(ctx, key, opts, listObj) }) } @@ -125,23 +128,65 @@ func (c *retryClient) GetList(ctx context.Context, key string, opts storage.List // ) func (c *retryClient) GuaranteedUpdate(ctx context.Context, key string, destination runtime.Object, ignoreNotFound bool, preconditions *storage.Preconditions, tryUpdate storage.UpdateFunc, cachedExistingObject runtime.Object) error { - return OnError(ctx, DefaultRetry, IsRetriableEtcdError, func() error { + return OnError(ctx, DefaultRetry, IsRetriableErrorOnWrite, func() error { return c.Interface.GuaranteedUpdate(ctx, key, destination, ignoreNotFound, preconditions, tryUpdate, cachedExistingObject) }) } -// IsRetriableEtcdError returns true if a retry should be attempted, otherwise false. -// errorLabel is set to a non-empty value that reflects the type of error encountered. -func IsRetriableEtcdError(err error) (errorLabel string, retry bool) { - if err != nil { - if etcdError, ok := etcdrpc.Error(err).(etcdrpc.EtcdError); ok { - if etcdError.Code() == codes.Unavailable { - errorLabel = "Unavailable" - retry = true - } - } +// These errors are coming back from the k8s.io/apiserver storage.Interface, not directly from an +// etcd client. Classifying them can be fragile since the storage methods may not return etcd client +// errors directly. +var errorLabelsBySuffix = map[string]string{ + "etcdserver: leader changed": "LeaderChanged", + "etcdserver: no leader": "NoLeader", + "raft proposal dropped": "ProposalDropped", + + "etcdserver: request timed out": "Timeout", + "etcdserver: request timed out, possibly due to previous leader failure": "Timeout", + "etcdserver: request timed out, possible due to connection lost": "Timeout", + "etcdserver: request timed out, waiting for the applied index took too long": "Timeout", + "etcdserver: server stopped": "Stopped", +} + +var retriableWriteErrorSuffixes = func() *regexp.Regexp { + // This list should include only errors the caller is certain have no side effects. + suffixes := []string{ + "etcdserver: leader changed", + "etcdserver: no leader", + "raft proposal dropped", + } + return regexp.MustCompile(fmt.Sprintf(`(%s)$`, strings.Join(suffixes, `|`))) +}() + +// IsRetriableErrorOnWrite returns true if and only if a retry should be attempted when the provided +// error is returned from a write attempt. If the error is retriable, a non-empty string classifying +// the error is also returned. +func IsRetriableErrorOnWrite(err error) (string, bool) { + if suffix := retriableWriteErrorSuffixes.FindString(err.Error()); suffix != "" { + return errorLabelsBySuffix[suffix], true + } + return "", false +} + +var retriableReadErrorSuffixes = func() *regexp.Regexp { + var suffixes []string + for suffix := range errorLabelsBySuffix { + suffixes = append(suffixes, suffix) + } + return regexp.MustCompile(fmt.Sprintf(`(%s)$`, strings.Join(suffixes, `|`))) +}() + +// IsRetriableErrorOnRead returns true if and only if a retry should be attempted when the provided +// error is returned from a read attempt. If the error is retriable, a non-empty string classifying +// the error is also returned. +func IsRetriableErrorOnRead(err error) (string, bool) { + if suffix := retriableReadErrorSuffixes.FindString(err.Error()); suffix != "" { + return errorLabelsBySuffix[suffix], true } - return + if etcdError, ok := etcdrpc.Error(err).(etcdrpc.EtcdError); ok && etcdError.Code() == codes.Unavailable { + return "Unavailable", true + } + return "", false } // OnError allows the caller to retry fn in case the error returned by fn is retriable @@ -163,6 +208,9 @@ func OnError(ctx context.Context, backoff wait.Backoff, retriable func(error) (s } lastErrLabel, retry = retriable(err) + if klog.V(6).Enabled() { + klog.V(6).InfoS("observed storage error", "err", err, "retriable", retry) + } if retry { lastErr = err retryCounter++ diff --git a/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/retry_etcdprobemonitor.go b/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/retry_etcdprobemonitor.go index ab210464f50..0e6c19b451e 100644 --- a/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/retry_etcdprobemonitor.go +++ b/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/retry_etcdprobemonitor.go @@ -26,14 +26,14 @@ func newRetryingETCD3ProberMonitor(c storagebackend.Config) (*etcd3RetryingProbe } func (t *etcd3RetryingProberMonitor) Probe(ctx context.Context) error { - return etcd3retry.OnError(ctx, etcd3retry.DefaultRetry, etcd3retry.IsRetriableEtcdError, func() error { + return etcd3retry.OnError(ctx, etcd3retry.DefaultRetry, etcd3retry.IsRetriableErrorOnRead, func() error { return t.delegate.Probe(ctx) }) } func (t *etcd3RetryingProberMonitor) Monitor(ctx context.Context) (metrics.StorageMetrics, error) { var ret metrics.StorageMetrics - err := etcd3retry.OnError(ctx, etcd3retry.DefaultRetry, etcd3retry.IsRetriableEtcdError, func() error { + err := etcd3retry.OnError(ctx, etcd3retry.DefaultRetry, etcd3retry.IsRetriableErrorOnRead, func() error { var innerErr error ret, innerErr = t.delegate.Monitor(ctx) return innerErr diff --git a/vendor/k8s.io/kubelet/config/v1beta1/types.go b/vendor/k8s.io/kubelet/config/v1beta1/types.go index 1f7bbc93931..ea7d826e508 100644 --- a/vendor/k8s.io/kubelet/config/v1beta1/types.go +++ b/vendor/k8s.io/kubelet/config/v1beta1/types.go @@ -720,6 +720,8 @@ type KubeletConfiguration struct { EnableSystemLogHandler *bool `json:"enableSystemLogHandler,omitempty"` // enableSystemLogQuery enables the node log query feature on the /logs endpoint. // EnableSystemLogHandler has to be enabled in addition for this feature to work. + // Enabling this feature has security implications. The recommendation is to enable it on a need basis for debugging + // purposes and disabling otherwise. // Default: false // +featureGate=NodeLogQuery // +optional diff --git a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go index 01886d6895e..07a44aef57d 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go @@ -194,7 +194,7 @@ func (ssc *defaultStatefulSetControl) truncateHistory( } historyLen := len(history) historyLimit := int(*set.Spec.RevisionHistoryLimit) - if historyLen <= historyLimit { + if historyLimit < 0 || historyLen <= historyLimit { return nil } // delete any non-live history to maintain the revision limit. diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index 734705e57e1..21ddf26f09e 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -524,7 +524,8 @@ const ( // alpha: v1.27 // beta: v1.30 // - // Enables querying logs of node services using the /logs endpoint + // Enables querying logs of node services using the /logs endpoint. Enabling this feature has security implications. + // The recommendation is to enable it on a need basis for debugging purposes and disabling otherwise. NodeLogQuery featuregate.Feature = "NodeLogQuery" // owner: @xing-yang @sonasingh46 diff --git a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go index 404757f4858..eed6070f08a 100644 --- a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go +++ b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go @@ -62689,7 +62689,7 @@ func schema_k8sio_kubelet_config_v1beta1_KubeletConfiguration(ref common.Referen }, "enableSystemLogQuery": { SchemaProps: spec.SchemaProps{ - Description: "enableSystemLogQuery enables the node log query feature on the /logs endpoint. EnableSystemLogHandler has to be enabled in addition for this feature to work. Default: false", + Description: "enableSystemLogQuery enables the node log query feature on the /logs endpoint. EnableSystemLogHandler has to be enabled in addition for this feature to work. Enabling this feature has security implications. The recommendation is to enable it on a need basis for debugging purposes and disabling otherwise. Default: false", Type: []string{"boolean"}, Format: "", }, diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/config/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/config/types.go index 60d502b55cc..a663ce80609 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/config/types.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/config/types.go @@ -408,6 +408,8 @@ type KubeletConfiguration struct { EnableSystemLogHandler bool // EnableSystemLogQuery enables the node log query feature on the /logs endpoint. // EnableSystemLogHandler has to be enabled in addition for this feature to work. + // Enabling this feature has security implications. The recommendation is to enable it on a need basis for debugging + // purposes and disabling otherwise. // +featureGate=NodeLogQuery // +optional EnableSystemLogQuery bool diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal.go index 20fc9da6f0d..b0a97a9b802 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal.go @@ -384,7 +384,7 @@ func (n *nodeLogQuery) splitNativeVsFileLoggers(ctx context.Context) ([]string, // copyServiceLogs invokes journalctl or Get-WinEvent with the provided args. Note that // services are explicitly passed here to account for the heuristics. func (n *nodeLogQuery) copyServiceLogs(ctx context.Context, w io.Writer, services []string, previousBoot int) { - cmdStr, args, err := getLoggingCmd(n, services) + cmdStr, args, cmdEnv, err := getLoggingCmd(n, services) if err != nil { fmt.Fprintf(w, "\nfailed to get logging cmd: %v\n", err) return @@ -392,6 +392,7 @@ func (n *nodeLogQuery) copyServiceLogs(ctx context.Context, w io.Writer, service cmd := exec.CommandContext(ctx, cmdStr, args...) cmd.Stdout = w cmd.Stderr = w + cmd.Env = append(os.Environ(), cmdEnv...) if err := cmd.Run(); err != nil { if _, ok := err.(*exec.ExitError); ok { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_linux.go index bbf0e977226..15a72024aac 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_linux.go @@ -26,9 +26,13 @@ import ( ) // getLoggingCmd returns the journalctl cmd and arguments for the given nodeLogQuery and boot. Note that -// services are explicitly passed here to account for the heuristics -func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) { - args := []string{ +// services are explicitly passed here to account for the heuristics. +// The return values are: +// - cmd: the command to be executed +// - args: arguments to the command +// - cmdEnv: environment variables when the command will be executed +func getLoggingCmd(n *nodeLogQuery, services []string) (cmd string, args []string, cmdEnv []string, err error) { + args = []string{ "--utc", "--no-pager", } @@ -70,7 +74,7 @@ func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) } args = append(args, fmt.Sprintf("--output=%s", output)) - return "journalctl", args, nil + return "journalctl", args, nil, nil } // checkForNativeLogger checks journalctl output for a service diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_others.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_others.go index 2f9e0ecb1a5..9e4900710ea 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_others.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_others.go @@ -24,8 +24,8 @@ import ( ) // getLoggingCmd on unsupported operating systems returns the echo command and a warning message (as strings) -func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) { - return "", []string{}, errors.New("Operating System Not Supported") +func getLoggingCmd(n *nodeLogQuery, services []string) (cmd string, args []string, cmdEnv []string, err error) { + return "", args, cmdEnv, errors.New("Operating System Not Supported") } // checkForNativeLogger on unsupported operating systems returns false diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_windows.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_windows.go index 5134d65e8d2..1957cb10220 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_windows.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_server_journal_windows.go @@ -27,9 +27,42 @@ import ( const powershellExe = "PowerShell.exe" -// getLoggingCmd returns the powershell cmd and arguments for the given nodeLogQuery and boot -func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) { - args := []string{ +// getLoggingCmd returns the powershell cmd, arguments, and environment variables for the given nodeLogQuery and boot. +// All string inputs are environment variables to stop subcommands expressions from being executed. +// The return values are: +// - cmd: the command to be executed +// - args: arguments to the command +// - cmdEnv: environment variables when the command will be executed +func getLoggingCmd(n *nodeLogQuery, services []string) (cmd string, args []string, cmdEnv []string, err error) { + cmdEnv = getLoggingCmdEnv(n, services) + + var includeSinceTime, includeUntilTime, includeTailLines, includePattern bool + if n.SinceTime != nil { + includeSinceTime = true + } + if n.UntilTime != nil { + includeUntilTime = true + } + if n.TailLines != nil { + includeTailLines = true + } + if len(n.Pattern) > 0 { + includePattern = true + } + + var includeServices []bool + for _, service := range services { + includeServices = append(includeServices, len(service) > 0) + } + + args = getLoggingCmdArgs(n, includeSinceTime, includeUntilTime, includeTailLines, includePattern, includeServices) + + return powershellExe, args, cmdEnv, nil +} + +// getLoggingCmdArgs returns arguments that need to be passed to powershellExe +func getLoggingCmdArgs(n *nodeLogQuery, includeSinceTime, includeUntilTime, includeTailLines, includePattern bool, services []bool) (args []string) { + args = []string{ "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", @@ -38,37 +71,67 @@ func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) psCmd := "Get-WinEvent -FilterHashtable @{LogName='Application'" if len(n.Since) > 0 { psCmd += fmt.Sprintf("; StartTime='%s'", n.Since) - } else if n.SinceTime != nil { - psCmd += fmt.Sprintf("; StartTime='%s'", n.SinceTime.Format(dateLayout)) + } else if includeSinceTime { + psCmd += fmt.Sprintf(`; StartTime="$Env:kubelet_sinceTime"`) } if len(n.Until) > 0 { psCmd += fmt.Sprintf("; EndTime='%s'", n.Until) - } else if n.UntilTime != nil { - psCmd += fmt.Sprintf("; EndTime='%s'", n.UntilTime.Format(dateLayout)) + } else if includeUntilTime { + psCmd += fmt.Sprintf(`; EndTime="$Env:kubelet_untilTime"`) } + var providers []string - for _, service := range services { - if len(service) > 0 { - providers = append(providers, "'"+service+"'") + for i := range services { + if services[i] { + providers = append(providers, fmt.Sprintf("$Env:kubelet_provider%d", i)) } } + if len(providers) > 0 { psCmd += fmt.Sprintf("; ProviderName=%s", strings.Join(providers, ",")) } - psCmd += "}" - if n.TailLines != nil { - psCmd += fmt.Sprintf(" -MaxEvents %d", *n.TailLines) + + psCmd += `}` + if includeTailLines { + psCmd += fmt.Sprint(` -MaxEvents $Env:kubelet_tailLines`) } - psCmd += " | Sort-Object TimeCreated" - if len(n.Pattern) > 0 { - psCmd += fmt.Sprintf(" | Where-Object -Property Message -Match '%s'", n.Pattern) + psCmd += ` | Sort-Object TimeCreated` + + if includePattern { + psCmd += fmt.Sprintf(` | Where-Object -Property Message -Match "$Env:kubelet_pattern"`) } - psCmd += " | Format-Table -AutoSize -Wrap" + psCmd += ` | Format-Table -AutoSize -Wrap` args = append(args, psCmd) - return powershellExe, args, nil + return args +} + +// getLoggingCmdEnv returns the environment variables that will be present when powershellExe is executed +func getLoggingCmdEnv(n *nodeLogQuery, services []string) (cmdEnv []string) { + if n.SinceTime != nil { + cmdEnv = append(cmdEnv, fmt.Sprintf("kubelet_sinceTime=%s", n.SinceTime.Format(dateLayout))) + } + if n.UntilTime != nil { + cmdEnv = append(cmdEnv, fmt.Sprintf("kubelet_untilTime=%s", n.UntilTime.Format(dateLayout))) + } + + for i, service := range services { + if len(service) > 0 { + cmdEnv = append(cmdEnv, fmt.Sprintf("kubelet_provider%d=%s", i, service)) + } + } + + if n.TailLines != nil { + cmdEnv = append(cmdEnv, fmt.Sprintf("kubelet_tailLines=%d", *n.TailLines)) + } + + if len(n.Pattern) > 0 { + cmdEnv = append(cmdEnv, fmt.Sprintf("kubelet_pattern=%s", n.Pattern)) + } + + return cmdEnv } // checkForNativeLogger always returns true for Windows diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go index 38017a588f7..426e5b9b8ad 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go @@ -169,6 +169,11 @@ type ActualStateOfWorld interface { // or have a mount/unmount operation pending. GetAttachedVolumes() []AttachedVolume + // GetAttachedVolume returns the volume that is known to be attached to the node + // with the given volume name. If the volume is not found, the second return value + // is false. + GetAttachedVolume(volumeName v1.UniqueVolumeName) (AttachedVolume, bool) + // Add the specified volume to ASW as uncertainly attached. AddAttachUncertainReconstructedVolume(volumeName v1.UniqueVolumeName, volumeSpec *volume.Spec, nodeName types.NodeName, devicePath string) error @@ -1125,6 +1130,18 @@ func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume { return allAttachedVolumes } +func (asw *actualStateOfWorld) GetAttachedVolume(volumeName v1.UniqueVolumeName) (AttachedVolume, bool) { + asw.RLock() + defer asw.RUnlock() + + volumeObj, ok := asw.attachedVolumes[volumeName] + if !ok { + return AttachedVolume{}, false + } + + return asw.newAttachedVolume(&volumeObj), true +} + func (asw *actualStateOfWorld) GetUnmountedVolumes() []AttachedVolume { asw.RLock() defer asw.RUnlock() diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler_common.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler_common.go index a9e656a7781..f3ff308e414 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler_common.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler_common.go @@ -269,6 +269,11 @@ func (rc *reconciler) unmountDetachDevices() { // Check IsOperationPending to avoid marking a volume as detached if it's in the process of mounting. if !rc.desiredStateOfWorld.VolumeExists(attachedVolume.VolumeName, attachedVolume.SELinuxMountContext) && !rc.operationExecutor.IsOperationPending(attachedVolume.VolumeName, nestedpendingoperations.EmptyUniquePodName, nestedpendingoperations.EmptyNodeName) { + + // Re-read the actual state of the world, maybe the volume got mounted in the meantime. + // This is safe, because there is no pending operation (checked above) and no new operation + // could start in the meantime. The only goroutine that adds new operations is this reconciler. + attachedVolume, _ = rc.actualStateOfWorld.GetAttachedVolume(attachedVolume.VolumeName) if attachedVolume.DeviceMayBeMounted() { // Volume is globally mounted to device, unmount it klog.V(5).InfoS(attachedVolume.GenerateMsgDetailed("Starting operationExecutor.UnmountDevice", "")) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go index 66ac77835c3..18cbec072f4 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go @@ -31,8 +31,13 @@ import ( "k8s.io/klog/v2" ) -// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent +// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent. If called with a device +// already resolved to devicemapper, do nothing. func (handler *deviceHandler) FindMultipathDeviceForDevice(device string) string { + if strings.HasPrefix(device, "/dev/dm-") { + return device + } + io := handler.getIo disk, err := findDeviceForPath(device, io) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 4d589781f00..56138e1457a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1197,7 +1197,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1257,7 +1257,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/apiextensions-apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1304,7 +1304,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1375,7 +1375,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1550,13 +1550,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1914,7 +1914,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1936,14 +1936,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1977,7 +1977,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1990,7 +1990,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2007,27 +2007,27 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2052,13 +2052,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kms v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2091,7 +2091,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2124,11 +2124,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2163,7 +2163,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2184,7 +2184,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.31.1 => github.com/openshift/kubernetes v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/kubernetes v1.31.1 => github.com/openshift/kubernetes v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2994,7 +2994,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3009,10 +3009,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3164,38 +3164,38 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250205072427-acb9630c20d2 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250205072427-acb9630c20d2 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250205072427-acb9630c20d2