From 45de584c1a6d1a50fa5f2a5f8a327a8699dedfa7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:35:16 +0000 Subject: [PATCH 1/9] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index ab8e1cf464..42a0a4e0d1 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.16.0-0.nightly-2025-01-19-145542" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-01-19-225543" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2025-01-22-190903" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-01-22-221630" From 051dd389bc9f3dfffb1c4ee47f0db2e5ae9fd5cf Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:35:16 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 48 +++++++++++++++++++++++++++++-- scripts/auto-rebase/commits.txt | 8 +++--- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 789238b945..2791cc3251 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,47 @@ -- openshift-controller-manager embedded-component 0e91805ec91f46b80b553027fd8a8aab194f50fc to bcf6e58edbcc8e7ce6f7e4d0658635688e0fc114 - - 66a076f 2024-11-04T14:05:35+00:00 skip unnecessary apply calls +- kubernetes embedded-component 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 + - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts + - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 + - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 + - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 + - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group + - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 + - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name + - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 + +- operator-framework-olm embedded-component 32cbf3f7b400d89e131ac00713cd426afd0fcce5 to 4ff31a477af44f7804c188fbd1946b9b239ab3fd + - f0b6089b 2025-01-21T08:41:40+01:00 [CARRY] address lint issues in namespace labeler plugin + - 1e2919e2 2025-01-21T08:41:32+01:00 [CARRY] fixup ns labeler plugin + - 231e3e58 2025-01-21T08:41:22+01:00 :bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483) + - 1fcca4a3 2025-01-20T11:21:26+01:00 bump golang.org/x/net to 0.34.0 (#3485) + - c5af7203 2025-01-20T11:20:49+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527) + - fbd4cea9 2025-01-20T10:38:09+01:00 bump golang.org/x/net to 0.34.0 (#387) + +- kubernetes image-amd64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 + - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts + - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 + - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 + - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 + - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group + - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 + - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name + - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 + +- kubernetes image-arm64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 + - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts + - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 + - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 + - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 + - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group + - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 + - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name + - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ae44501103..499fd86706 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -9,11 +9,11 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88 https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/etcd embedded-component e7911c0d19925c0a67328052a8580a80fb40cb5b -https://github.com/openshift/kubernetes embedded-component 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca +https://github.com/openshift/kubernetes embedded-component ef2a55c520f6a4c95996ff54c41fb58959750306 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 https://github.com/openshift/machine-config-operator embedded-component adc9ad759067e02cf643ec4beaf731d5245bbfe3 https://github.com/openshift/openshift-controller-manager embedded-component bcf6e58edbcc8e7ce6f7e4d0658635688e0fc114 -https://github.com/openshift/operator-framework-olm embedded-component 32cbf3f7b400d89e131ac00713cd426afd0fcce5 +https://github.com/openshift/operator-framework-olm embedded-component 4ff31a477af44f7804c188fbd1946b9b239ab3fd https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6 https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-amd64 cf533b548154f7f2e828a44864477bbbb881692d @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415 https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-amd64 c38f4734c6b6931c75d46674122fb4b838b6e64b https://github.com/openshift/ovn-kubernetes image-amd64 b24157b7b38f1be8a6175a2c7cae0fe8ece97f67 -https://github.com/openshift/kubernetes image-amd64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca +https://github.com/openshift/kubernetes image-amd64 ef2a55c520f6a4c95996ff54c41fb58959750306 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-arm64 cf533b548154f7f2e828a44864477bbbb881692d https://github.com/openshift/coredns image-arm64 1e417656c1c72d3410b31ee08caf25bcdf8836e3 @@ -34,5 +34,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415 https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-arm64 c38f4734c6b6931c75d46674122fb4b838b6e64b https://github.com/openshift/ovn-kubernetes image-arm64 b24157b7b38f1be8a6175a2c7cae0fe8ece97f67 -https://github.com/openshift/kubernetes image-arm64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca +https://github.com/openshift/kubernetes image-arm64 ef2a55c520f6a4c95996ff54c41fb58959750306 https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac From 0cccbc433bfba954efe11eab04c96e06c2f62d6b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:35:59 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 62 +++++++++++++++++----------------- go.sum | 104 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index bbb6045701..787a63006e 100644 --- a/go.mod +++ b/go.mod @@ -233,36 +233,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241119204217-67d33871ba24 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241119204217-67d33871ba24 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250122025621-ef2a55c520f6 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes ) replace ( @@ -273,4 +273,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 // 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-20241119204217-67d33871ba24 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes diff --git a/go.sum b/go.sum index c5e1e493da..78f5805172 100644 --- a/go.sum +++ b/go.sum @@ -502,60 +502,60 @@ github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992 h1:fh7P github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes v0.0.0-20241119204217-67d33871ba24 h1:9K1zdrDRa7D7/ese+wz6KJGqM6EP37nMeZ2W0ksaoq4= -github.com/openshift/kubernetes v0.0.0-20241119204217-67d33871ba24/go.mod h1:VvWl14fh7k3xcZWYRuOmSzgBpOdMEsL/zWK6JJxRqdQ= +github.com/openshift/kubernetes v0.0.0-20250122025621-ef2a55c520f6 h1:0IBtLwyUkC2YVUtu/MuhRKNQoo0+KAU9Sk1vzuLgVis= +github.com/openshift/kubernetes v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:VvWl14fh7k3xcZWYRuOmSzgBpOdMEsL/zWK6JJxRqdQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 h1:XbvnIzWITQAGkucBNg+7fCBF0ysRySNSOkTvYWFU6fA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246/go.mod h1:XvsDWvUXlITs6q4deif+DIbomfUhxf6igCMjFiP6jHU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 h1:gPkzUP1nkbEpt4DLRypOD5yHrJwivxnqi0u/sZS/GFM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 h1:VeusmQMUD5Q87p5Pp8wgOp0//bG88p1XTdT/a0/iRO8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24/go.mod h1:wUPaZ3kD56u1+Otpop2sGPnb5Jd05G9+CASPAq4jajM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 h1:W0YBvodfQkNjQruTBmg9GTnAgps53g/OUeFCpcNWm3U= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 h1:w7rIWhWM+28VeKZJZ5Ym6qHOnqifnmryCjxljli5NgY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24/go.mod h1:4J0wj1QvmT02q78bPEqb8EAaT18iFaaGL5LDXJtoNz4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 h1:1zNAIqj9+xggxakx2XXJYD30A4oC0TicAXGJHcbOMKg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 h1:L5JLJSoG61x2ZjzwWOYK7nCO3GLc4O8KariIIf/+csU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 h1:mIAaUUIRluxKn+1AeR+JVWGoIo7U35vjt9iX2UN62Hk= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24 h1:VD6jCTYg2j0D2+rcd16dh1ZoCdv16Bxybp9xBMltFGw= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 h1:EWPYAMsRVh1lcGOU78fkNOK6gJ9hNaCFEQwpKFsGP4c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 h1:thMFxQLakErcaDCPQuOIKN7TFCEpHYn3sS4D+WSFOVo= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24/go.mod h1:Ken1KocNhJBJHBCvzeByTlXNO+oxxh982ieimC6KX4g= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 h1:garFXpd2VKSR52LCAdWg/KFa6QIyxEGz3RnuM+hOlqA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24 h1:EXGcRd1spGvyCX1dnBvPk3f7EbbSMoHBgyZlEUwNEIA= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 h1:fcwqy6ifepP4pR3scZvJxrKdy/sEuLWwDILBSvD6Sss= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24 h1:6lX4gJMTYdSs9DN8wzCaByQB73MErr9Wlc3Uiq+OnEU= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24 h1:urjXtaIiKhs6wHwmK7V1JD6kJDvAhnpJTfGKgAKL+Yw= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 h1:keHzOLZJqAnoxqpGSay1K6+v9xgi5m6a4rjzxPNt8Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 h1:TI/4mI4dc9mUkPsh2eN+rO5b8qeanhZ/W8ojxfAH0SY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24/go.mod h1:4J7wfAzEbaohBbEGIixBHQL5SIyinxnGKUjlwn9L3YQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24 h1:9Y0EzaRBO7fPm3PIkW3jK7X3HSX1CXTsJsF5sL/Kvc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24 h1:mf9g4PRU0KacIWq1oFXb/YAQG9OLAgC2wE0iY/qU+4E= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 h1:TKmKINX8BixISi8EKFWe/s+bovlsWrTo7p4368/hXi8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 h1:AnL0gaveVtGf+DycDAZDD5rXlEiiZzRxbbJuzByYgio= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 h1:PgcWb8oIxqBVhRCNCiNAaGmnYEMnpqgWXQuRgOGmEnM= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 h1:28ivV2WjA3HNbJKRnvRQ2eQ6UQA5la8ANxISE470zBE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24 h1:4k1ZXyGRQCTC/sx+QrfJ1dpF/YzAlkCu27K/9vFBVcY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 h1:v50ZYaWsLj7fYfvcsOeziViwA6boHz326s3ZcGxlylY= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 h1:eGbpasmP1GFara31OrbZdBHHnZfkADcVrMrEsqDM810= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 h1:3RKUxoZws9MQeYy8I0Ngik2cCfFIPY7a05OuYwDSUfI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:wUPaZ3kD56u1+Otpop2sGPnb5Jd05G9+CASPAq4jajM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 h1:JP8zWzdQjhUBdH20eIsr545IYagit18aFocXTnm4bXw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 h1:9KVa4anOGyHccehrGZVZa2yWS6E7SZMi2buxRV4qc0E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:4J0wj1QvmT02q78bPEqb8EAaT18iFaaGL5LDXJtoNz4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 h1:ueISrRHNl/P+MrySPu/RPaAalqklSTNWMSF5H4wMMAo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 h1:xFy4CsvTrubFG0plV6elRw8h9Sz0kUJ/ikd56nc9lK8= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 h1:2JOGc1pizyZ6eZ4SYgnznNkgAED3uM/7V4ogvbpv0gQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 h1:uUV2N/Od3xN4Jb1Qf9YZn56QeilV4Kb+c/teVVDf0UE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 h1:17OQh3Ukll+ImtN+u78xNJrqJ7PjZ82I9Z2M6AqVvUY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 h1:DQZP9I8LvS+waJsD+S702AraoUS0tLZMfOwYDtOPhBU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:Ken1KocNhJBJHBCvzeByTlXNO+oxxh982ieimC6KX4g= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 h1:haZJiVZcFh1uCfYiNihvOAimDiumZunabE51EwPS59s= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 h1:H1CI7ZZkIFlCFBFp5i3kIAlIigzYfEZZM6tZIe2qg1M= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 h1:iO9qginaRCtnEI9fdgnSxgBtF26VD5gP7nBTD2ZC6hw= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 h1:XFjpCVZzWSGDYK524IrbndzHHHD/fIsKw/tGSbugLbw= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 h1:JyHpUiADNZi8YsKPQ1uSkithYbenw6N+KtPCCpieV2k= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 h1:MBo5akaZlPyGQ01KA6RMmP2WKo1qxhB0l8J1/HXCBLY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 h1:w2DtGN+IR/W7NjOycVXJ58Zduy+vh32XWR7AyRGWel8= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:4J7wfAzEbaohBbEGIixBHQL5SIyinxnGKUjlwn9L3YQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 h1:APEAO4yYfA9EzvuVh/tOeW4f1M5CxvOLgG7k/q1iiQQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 h1:GNoIH9vQXGW7x5D2Ho/7bRkeauIWasg/YedLMrp8oOU= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 h1:MYl5IKkQm3/4D793Pd2zQOF3qLHZu4I8GvraFP8MGKY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 h1:V4bvqZN9p1mbSyEfH4ieiziZQzdgj6/WU8cTfbBc5vA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 h1:OCZTGdJpe8AhzQ+VB66e4G3GoMWwnq/4I+uorGclkAo= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 h1:mrL+bOmi4TQ/CKSdULJ6bOac3dgpRlfG2s2TMXVTGsE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 h1:gRjlHl2pxk6hrQabzKbdLhTHgr9VYkbHMH7Css8ZBtA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 h1:41+EmfrJMHjoilB3BKH+I4guKmIzrynEigUPkOovhco= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/openshift/route-controller-manager v0.0.0-20240306200724-3112b458983c h1:Y+CdtMBqLmL5RQAYzugn3O5xsKC6y0oYpqY9Ds/PMr8= From b8fd506d37195427e781c45355ea767287590b63 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:16 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/k8s.io/apiserver/pkg/server/config.go | 2 +- .../defaultpreemption/default_preemption.go | 7 ++ vendor/modules.txt | 114 +++++++++--------- 3 files changed, 65 insertions(+), 58 deletions(-) diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go index b96db5327e..0af517401e 100644 --- a/vendor/k8s.io/apiserver/pkg/server/config.go +++ b/vendor/k8s.io/apiserver/pkg/server/config.go @@ -1240,7 +1240,7 @@ func AuthorizeClientBearerToken(loopback *restclient.Config, authn *Authenticati tokens[privilegedLoopbackToken] = &user.DefaultInfo{ Name: user.APIServerUser, UID: uid, - Groups: []string{user.SystemPrivilegedGroup}, + Groups: []string{user.AllAuthenticated, user.SystemPrivilegedGroup}, } tokenAuthenticator := authenticatorfactory.NewFromTokens(tokens, authn.APIAudiences) diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go index 660f557bb4..a338ce462c 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go @@ -192,6 +192,8 @@ func (pl *DefaultPreemption) SelectVictimsOnNode( } var victims []*v1.Pod numViolatingVictim := 0 + // Sort potentialVictims by pod priority from high to low, which ensures to + // reprieve higher priority pods first. sort.Slice(potentialVictims, func(i, j int) bool { return util.MoreImportantPod(potentialVictims[i].Pod, potentialVictims[j].Pod) }) // Try to reprieve as many pods as possible. We first try to reprieve the PDB // violating victims and then other non-violating ones. In both cases, we start @@ -226,6 +228,11 @@ func (pl *DefaultPreemption) SelectVictimsOnNode( return nil, 0, framework.AsStatus(err) } } + + // Sort victims after reprieving pods to keep the pods in the victims sorted in order of priority from high to low. + if len(violatingVictims) != 0 && len(nonViolatingVictims) != 0 { + sort.Slice(victims, func(i, j int) bool { return util.MoreImportantPod(victims[i], victims[j]) }) + } return victims, numViolatingVictim, framework.NewStatus(framework.Success) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4aaefc1793..c20889d16a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1361,7 +1361,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 +# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1465,7 +1465,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1532,7 +1532,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1700,13 +1700,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2044,7 +2044,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 +# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2067,14 +2067,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-20241119204217-67d33871ba24 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2108,7 +2108,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 +# k8s.io/component-helpers v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2121,7 +2121,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 +# k8s.io/controller-manager v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2138,19 +2138,19 @@ 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-20241119204217-67d33871ba24 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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-20241119204217-67d33871ba24 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2174,13 +2174,13 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 +# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 +# k8s.io/kube-aggregator v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2211,7 +2211,7 @@ k8s.io/kube-aggregator/pkg/controllers/status 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-20241119204217-67d33871ba24 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 @@ -2244,11 +2244,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-20241119204217-67d33871ba24 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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-20241119204217-67d33871ba24 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2283,7 +2283,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 +# k8s.io/kubelet v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2305,7 +2305,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.29.1 => github.com/openshift/kubernetes v0.0.0-20241119204217-67d33871ba24 +# k8s.io/kubernetes v1.29.1 => github.com/openshift/kubernetes v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3105,7 +3105,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/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3147,7 +3147,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3162,10 +3162,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-20241119204217-67d33871ba24 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 +# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3316,38 +3316,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241119204217-67d33871ba24 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241119204217-67d33871ba24 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241119204217-67d33871ba24 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250122025621-ef2a55c520f6 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 From b190a913ca546e3b303b188bf8c3dfa65d636b08 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:16 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 60 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index fbe38e4ec1..203e89b361 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -151,35 +151,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241119204217-67d33871ba24 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241119204217-67d33871ba24 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 981dfb4705..8088d55a45 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -206,20 +206,20 @@ github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 h1:2+vn github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 h1:gPkzUP1nkbEpt4DLRypOD5yHrJwivxnqi0u/sZS/GFM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 h1:W0YBvodfQkNjQruTBmg9GTnAgps53g/OUeFCpcNWm3U= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 h1:w7rIWhWM+28VeKZJZ5Ym6qHOnqifnmryCjxljli5NgY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24/go.mod h1:4J0wj1QvmT02q78bPEqb8EAaT18iFaaGL5LDXJtoNz4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 h1:1zNAIqj9+xggxakx2XXJYD30A4oC0TicAXGJHcbOMKg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 h1:L5JLJSoG61x2ZjzwWOYK7nCO3GLc4O8KariIIf/+csU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 h1:EWPYAMsRVh1lcGOU78fkNOK6gJ9hNaCFEQwpKFsGP4c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 h1:TKmKINX8BixISi8EKFWe/s+bovlsWrTo7p4368/hXi8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 h1:eGbpasmP1GFara31OrbZdBHHnZfkADcVrMrEsqDM810= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 h1:JP8zWzdQjhUBdH20eIsr545IYagit18aFocXTnm4bXw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 h1:9KVa4anOGyHccehrGZVZa2yWS6E7SZMi2buxRV4qc0E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:4J0wj1QvmT02q78bPEqb8EAaT18iFaaGL5LDXJtoNz4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 h1:ueISrRHNl/P+MrySPu/RPaAalqklSTNWMSF5H4wMMAo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 h1:xFy4CsvTrubFG0plV6elRw8h9Sz0kUJ/ikd56nc9lK8= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 h1:17OQh3Ukll+ImtN+u78xNJrqJ7PjZ82I9Z2M6AqVvUY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 h1:MYl5IKkQm3/4D793Pd2zQOF3qLHZu4I8GvraFP8MGKY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= From 41c99c6f16ea3368dbca5c0f77cf2ebed0feaa6a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:22 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index b6224c74ae..193824a32b 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -675,7 +675,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -729,17 +729,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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-20241119204217-67d33871ba24 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -886,7 +886,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -921,7 +921,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-20241119204217-67d33871ba24 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 ## explicit; go 1.21 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1049,33 +1049,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241119204217-67d33871ba24 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241119204217-67d33871ba24 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241119204217-67d33871ba24 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241119204217-67d33871ba24 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241119204217-67d33871ba24 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241119204217-67d33871ba24 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241119204217-67d33871ba24 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241119204217-67d33871ba24 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241119204217-67d33871ba24 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241119204217-67d33871ba24 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241119204217-67d33871ba24 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241119204217-67d33871ba24 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241119204217-67d33871ba24 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241119204217-67d33871ba24 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241119204217-67d33871ba24 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241119204217-67d33871ba24 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241119204217-67d33871ba24 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250122025621-ef2a55c520f6 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250122025621-ef2a55c520f6 From b7ddb84ac99475c693edc777ac84269ce939075a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:22 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 10b444088a..369b4d4d9e 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:99ed43b00a9f90ef2cd40b863f3b02df58e174122d2836c79ee965e719305642" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f46e78078ce043688e3762a4985101a751551a7dcf99e8eed2106537e6e5892" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index db7b2de499..d961ce70f4 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.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:42d5bb1071c7b1c63ae470b603ee7c149aa3086dcd138dafcfc071f2b5a8e0a8" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b17a3779457df48bcd585a00ed7fcb01710cabc44f7f38be3d7399cb22d33ab" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 40c54df442ee580ee57700d00490e863cb605a06 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:23 +0000 Subject: [PATCH 8/9] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 02f7fbd32c..668a3e2b48 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-01-19-225543" + "base": "4.16.0-0.nightly-arm64-2025-01-22-221630" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f3c3a60e78bd2dcf3e2a38c5f685565dc54d6f7ca719cb75dde0e36637884eb", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index a10b383a66..e897543d84 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.16.0-0.nightly-2025-01-19-145542" + "base": "4.16.0-0.nightly-2025-01-22-190903" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:206b23c9a596391210050367b64d28085421f3889b53792082e42890526f14f7", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index dc2c246997..26e2d1e5be 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:684786e22528524f839867cbe0596c38492f5955173bd5ff498a1cc8a9139746 + digest: sha256:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:615f591deaa19a25fbf0714ce9a8fc838e4a2650be72f04088671e02f44aa1d2 + digest: sha256:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:615f591deaa19a25fbf0714ce9a8fc838e4a2650be72f04088671e02f44aa1d2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:684786e22528524f839867cbe0596c38492f5955173bd5ff498a1cc8a9139746 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index c012ff4e42..fb1d384290 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d7b09ba0ff25852e4f3d802cd070b079dcffd00ac7e986d9b554b7927133635 + digest: sha256:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:df8835185bc0051c3582a6b053cf337d09c2e57ee4dc324b819ddcc93aa6e602 + digest: sha256:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df8835185bc0051c3582a6b053cf337d09c2e57ee4dc324b819ddcc93aa6e602 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d7b09ba0ff25852e4f3d802cd070b079dcffd00ac7e986d9b554b7927133635 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 0b85ed9727..a723f28b89 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-01-19-225543" + "base": "4.16.0-0.nightly-arm64-2025-01-22-221630" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:684786e22528524f839867cbe0596c38492f5955173bd5ff498a1cc8a9139746", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:615f591deaa19a25fbf0714ce9a8fc838e4a2650be72f04088671e02f44aa1d2", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562" } } 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 08608517cf..66525e9e7c 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-2025-01-19-145542" + "base": "4.16.0-0.nightly-2025-01-22-190903" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d7b09ba0ff25852e4f3d802cd070b079dcffd00ac7e986d9b554b7927133635", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df8835185bc0051c3582a6b053cf337d09c2e57ee4dc324b819ddcc93aa6e602", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7d14361dd9..f0beff191b 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-01-19-225543" + "base": "4.16.0-0.nightly-arm64-2025-01-22-221630" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4e259d678fe17aa43da2afce590ae8168b1bb9e517c3d371f863464bcc68e55", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55a8b1d26b1ebbfa3f0058084600c3c8a97e5d80500c76f7c87bb9781ce1c8ee", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d5bb1071c7b1c63ae470b603ee7c149aa3086dcd138dafcfc071f2b5a8e0a8", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b17a3779457df48bcd585a00ed7fcb01710cabc44f7f38be3d7399cb22d33ab", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9461df932934bc0646461a7ba1561904fbf994e55c05ce6407178ae181fb734", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index cec5dca8da..93d28f07b9 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2025-01-19-145542" + "base": "4.16.0-0.nightly-2025-01-22-190903" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1191f7f0277da8d27b0e513bc41df7955e4d3fd59652ddad0efec0c860e2cc6", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bdce6aae7b204b90597b01407a0307c5d350cb315f720a682202d0728f78e44", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99ed43b00a9f90ef2cd40b863f3b02df58e174122d2836c79ee965e719305642", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f46e78078ce043688e3762a4985101a751551a7dcf99e8eed2106537e6e5892", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e244052a2470f09c4669720e3cc7675c212a7c7f35ebfc3b2104682bc2ec758e", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", From a28379b28dfe680ef088dd961d5ef97ca849f6e0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:36:25 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 4 ++-- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index b932beb96a..26e339480d 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=29 -KUBE_GIT_VERSION=v1.29.10 -KUBE_GIT_COMMIT=67d33871ba24f0e8c4d2d201a4c4decaabfa1eca +KUBE_GIT_VERSION=v1.29.11 +KUBE_GIT_COMMIT=ef2a55c520f6a4c95996ff54c41fb58959750306 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index f9cd2f4ab9..b12b1e89d6 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2025-01-19-225543 +OCP_VERSION := 4.16.0-0.nightly-arm64-2025-01-22-221630 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 26c6c755b8..3d2233f815 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2025-01-19-145542 +OCP_VERSION := 4.16.0-0.nightly-2025-01-22-190903