From aa23c29bd7c111bddeed5a35fdf4694e86c6f5cd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:30:13 +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 151d63b3e6..74ae6c1998 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.19.0-0.nightly-2025-05-13-053644" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-05-13-055933" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-05-19-005500" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-05-19-055614" From 32f4e50b9ba04106d3ad47d3c9b85c794cfdc983 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:30:13 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 37 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 18 +++++++-------- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..774d305611 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,37 @@ +- cluster-ingress-operator embedded-component 2e6bd66d4ad11f58b8dea2677a94751bb372dca5 to 6d54169d4c6643ae9b6ff81b3a21b929934062fa + - d838765 2025-05-14T18:52:16+00:00 Check capabilities before watching OLM resource + +- cluster-kube-apiserver-operator embedded-component 23b5175aa2d5b8f7364ef4aed1966745d6735c2a to 446153e4e3cec78da777fef34c51a40ba6e8006b + - e53b579 2025-05-15T17:14:34+00:00 SCC: add hostmount-anyuid-v2 + - 6030886 2025-05-12T15:09:05+02:00 webhookcontroller: change cert lifetime argument to time.Duration + - 250d6d6 2025-05-12T15:08:32+02:00 bump library-go + +- kubernetes embedded-component f6cfe0c54a1fa9314c65e30c613df641c7226ed0 to 9fe7dfdeb6714effef45be12ec451a0f06893660 + - ed29f7f4e 2025-05-14T14:00:34+00:00 UPSTREAM: 131236: RWX tests should create RWX volumes + - 60a5c4c7c 2025-05-07T14:13:07+00:00 UPSTREAM: 131418: Check for newer fields when deciding expansion recovery feature status + +- machine-config-operator embedded-component a9859b62f67382ee2042209f5e98b91cb5c45dff to aae92b4dbfe9b66e29f0c0fe7551173f10e04b61 + - a172d19f 2025-05-15T16:16:24+00:00 OCPBUGS-55439: scope MCD node listers to current node + - 6afdfa18 2025-05-14T11:21:02+00:00 msbic: add hot loop detection + - ae280cb2 2025-05-13T18:46:04+00:00 Compare the osImageURLs for OS validation check + - 32216875 2025-05-13T15:00:05+00:00 node_controller: implement LayeredNodeState + - 2b07d56f 2025-05-13T09:54:21-05:00 parsing error to report full-render reconciliation fails vs partial render fails + - c6fe4a63 2025-05-12T14:04:43+00:00 OWNERS: update owners file with current MCO team members + +- operator-framework-olm embedded-component ec31de865be0c822d967ec8fe563c6eb8c4757e5 to 358b7053a231876cda29cf4d822e3e702389b117 + - 44bc4d41 2025-05-12T14:18:32+01:00 fix(olm): improve error logging for missing olm.managed label (#3558) + +- oc image-amd64 e468aa68e754e22997f526fcdbbd470387ff5e33 to c88fd60ed9c4a349d52770884b3aad828432d01d + - 8c8e461c 2025-05-13T17:08:50+00:00 Adding sos.conf file for default sos config into the tools image + +- kubernetes image-amd64 f6cfe0c54a1fa9314c65e30c613df641c7226ed0 to 9fe7dfdeb6714effef45be12ec451a0f06893660 + - ed29f7f4e 2025-05-14T14:00:34+00:00 UPSTREAM: 131236: RWX tests should create RWX volumes + - 60a5c4c7c 2025-05-07T14:13:07+00:00 UPSTREAM: 131418: Check for newer fields when deciding expansion recovery feature status + +- oc image-arm64 e468aa68e754e22997f526fcdbbd470387ff5e33 to c88fd60ed9c4a349d52770884b3aad828432d01d + - 8c8e461c 2025-05-13T17:08:50+00:00 Adding sos.conf file for default sos config into the tools image + +- kubernetes image-arm64 f6cfe0c54a1fa9314c65e30c613df641c7226ed0 to 9fe7dfdeb6714effef45be12ec451a0f06893660 + - ed29f7f4e 2025-05-14T14:00:34+00:00 UPSTREAM: 131236: RWX tests should create RWX volumes + - 60a5c4c7c 2025-05-07T14:13:07+00:00 UPSTREAM: 131418: Check for newer fields when deciding expansion recovery feature status + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 4a0f6cb7a4..0510dc2138 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,8 +1,8 @@ https://github.com/openshift/api embedded-component d22fca85e3b9f77f0cf2b43759a5ff927e605f57 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cf99de974354133f853928cff9e19ad19c5347d9 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 -https://github.com/openshift/cluster-ingress-operator embedded-component 2e6bd66d4ad11f58b8dea2677a94751bb372dca5 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 23b5175aa2d5b8f7364ef4aed1966745d6735c2a +https://github.com/openshift/cluster-ingress-operator embedded-component 6d54169d4c6643ae9b6ff81b3a21b929934062fa +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 446153e4e3cec78da777fef34c51a40ba6e8006b https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component cec410b7f877a6eef57968889a644b848bdb540a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 8740a60de76690a17d5081db078eb93dfdb7a066 https://github.com/openshift/cluster-network-operator embedded-component 2a1d6159a44bf8aa26bba9981f144006a1d99990 @@ -10,26 +10,26 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4cdeb7473f5c26 -https://github.com/openshift/kubernetes embedded-component f6cfe0c54a1fa9314c65e30c613df641c7226ed0 +https://github.com/openshift/kubernetes embedded-component 9fe7dfdeb6714effef45be12ec451a0f06893660 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component a9859b62f67382ee2042209f5e98b91cb5c45dff +https://github.com/openshift/machine-config-operator embedded-component aae92b4dbfe9b66e29f0c0fe7551173f10e04b61 https://github.com/openshift/openshift-controller-manager embedded-component 8be524d728d03e61ee029ad2f7229ca97c93f87f -https://github.com/openshift/operator-framework-olm embedded-component ec31de865be0c822d967ec8fe563c6eb8c4757e5 +https://github.com/openshift/operator-framework-olm embedded-component 358b7053a231876cda29cf4d822e3e702389b117 https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7 -https://github.com/openshift/oc image-amd64 e468aa68e754e22997f526fcdbbd470387ff5e33 +https://github.com/openshift/oc image-amd64 c88fd60ed9c4a349d52770884b3aad828432d01d https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-amd64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-amd64 bfd593c2783b8ab720f19e62e4dcfa9b8b2881fb -https://github.com/openshift/kubernetes image-amd64 f6cfe0c54a1fa9314c65e30c613df641c7226ed0 +https://github.com/openshift/kubernetes image-amd64 9fe7dfdeb6714effef45be12ec451a0f06893660 https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 -https://github.com/openshift/oc image-arm64 e468aa68e754e22997f526fcdbbd470387ff5e33 +https://github.com/openshift/oc image-arm64 c88fd60ed9c4a349d52770884b3aad828432d01d https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-arm64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-arm64 bfd593c2783b8ab720f19e62e4dcfa9b8b2881fb -https://github.com/openshift/kubernetes image-arm64 f6cfe0c54a1fa9314c65e30c613df641c7226ed0 +https://github.com/openshift/kubernetes image-arm64 9fe7dfdeb6714effef45be12ec451a0f06893660 https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7 From 819ca6b567d85cae899093db7049e1a4f55f4c7b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:30:53 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 64 +++++++++++++++++----------------- go.sum | 108 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/go.mod b/go.mod index 3c97744d96..ca1e0c454a 100644 --- a/go.mod +++ b/go.mod @@ -216,35 +216,35 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250505182703-f6cfe0c54a1f // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250515122228-9fe7dfdeb671 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes ) replace ( @@ -255,8 +255,8 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // 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-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes diff --git a/go.sum b/go.sum index 2a39257b28..fd15d5ff89 100644 --- a/go.sum +++ b/go.sum @@ -261,62 +261,62 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:4u4yoryqRDNV+oAR5F+MABA3QWmHNo0WB5JmzQn/Uik= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:mFYy67IOqmbRf/kRUvsHixzo3iG+1OF2W2+jVIQRAnU= -github.com/openshift/kubernetes v0.0.0-20250505182703-f6cfe0c54a1f h1:mJXS9zw8Z52Rr54cM7+FTd2Wc9zLr9Xr+Iwj3fUa1nw= -github.com/openshift/kubernetes v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= +github.com/openshift/kubernetes v0.0.0-20250515122228-9fe7dfdeb671 h1:S0MArIvXEj8JYCkF4NuBbaEC8hrnu91n225ssa7mYHs= +github.com/openshift/kubernetes v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f h1:ZUsjiuVb+71CKTeBpzeFT+IDAM5KpwrK4BK82ZkpNOM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f h1:JLbR99mYu1hsr0s//CZdjaBcOPiRsF/KGgkDsiS1qto= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f h1:hDmE6Vy+KrqwG7ZCApf0B/7qWPHb0cq18RXaXYI+al0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f h1:Y/D7Hn6z/EcwjgwVEfbwjPAPiX0WMoSL86Ix86qNwqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f h1:s508PYk3/HqDtj/YxFIL3Hc593X/UGobA/x6EHz2mOo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f h1:l2Wtx1MJlFKyRiUtDu9z01n1WrNoXFsJp4VlXmJKkG8= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f h1:ZttOXr4vk/eNKCrV0G1D7e4YNwZmEVeM7zMrqL3Oy4Q= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f h1:dXSBIHlcKjJFWSWO6wAccwfXo+NnBHHc7z3Ylg5S7DA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f h1:lqkYTljOcm+6r5jmBAgrmH+cDrd0ALjA3LBgN94AhJg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f h1:i2vr9oQWZZoh5Y8SkFUVNMvSoNG7xQVlOL1oShC34EI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f h1:Ah5RBiM+T7xx2YmADPI3QCf3Gwc4VEr4/1t/TlfYhlE= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f h1:XT3CVprTgP+guBiSydzfwDXzN+3zWeUD510cGxM0pfk= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f h1:tqvgN+e0AGm8GhSU4HzVJGiGtDcp6VyAN/mNnz3+YQ4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f h1:S4TTtKrAaP3rDqzirHC9KT/wAo7gDSlp1xEMoKC3aGY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f h1:Oo+HIHSI1DPmTnBNLm8j1Zwmradhw3fjn8xNFt32eOM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f h1:ZKeYM3DUmCNfNCzW/nPIo4G5NeeotvSLKr6w21Yhlv4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f h1:ylgFktqnffs8IT2AF6L0h8Rj8yxYtwCJpIZwxG6t39E= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f h1:YwgRhg3tQTo+/8H0fm0YuSZYsfZeFFGld5Rj+Wun01E= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f h1:Rx+36UZGkOHjbyD4j+KbPxHK/X/tXhrpbXX09j5sGHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f h1:qHeTLrDAKG8f+k5v7qsguIuHZth1+F3hoYVh6QdHyu8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f h1:+lsZgurZSZlOnp43Zpc+KKlW7hSx9Pg4W3raeXAE4Yc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f h1:JrAbpWFldn/KqtPSsBuB4rNP/7vehP9fJH9AJX+zPe4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f h1:ejteRx56ahUAR9UFZyZbCrGHrGrKY1MZzSRpweiiJTM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f h1:e4PM26y+LFq+kTJXTz5JlgQZw7bqJ2/mJQbuvVlF9yE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f h1:ns23Li5DJuH2Bg8t4Sc5HJhDTaSlEk9hrE5DKNHwV4I= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f h1:2FRk2wIcuIoJoU+7sLrd0wH+on15eVQ0rRW4p5u2uXk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 h1:uCZwPW8FLaTkv453Z6kZt/rPkK7c/uWId1+wS25BTg0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 h1:f1RBZY3lBQSVAuiz4Q4+JkEJTIUBkQDuL+Gt9Xm68NY= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 h1:hNYsvZPQTkSEwIwxxIEcwiDRDxHbbXBV+EAvrGkDuw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 h1:SElwMXEjUWp8p7us6QBZcbpKJX2NX6lEYUbg+BeUwVw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 h1:VhGuz88yrsNib1tBzotRTPKY16kSijLNTgLqm4fN61U= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 h1:D3s2zwY0TqNe5Uz1FPk6lgtL+fUXjHwrzumtMe0Z1so= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 h1:O1fcB9uSoDPEod/9xZ7eliAQ+lfcs96aX+2Wr+cuZtE= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 h1:dKxPvvPt9eupUQIsxU3LT5tBvwugI7dgeQ5RSH3rAj8= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 h1:h4h68kwl89UaWLe9Wkof7/zylfPwDGRTjcFV6a9UXcI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 h1:iuRaB2OZlzNSRUpIm5krE82Y2ZiK2hNwcPxKkVVJ5t0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 h1:VS/tYkUMnDqSt1dwlXb8UO/tm6zNOH7rz1l2wDM4/R8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 h1:YMY9uSJlIwmweoABRqIE+DL4ckt/e/9o/Fup+fA40uM= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 h1:ah3oRLhTx82vfyUS3ridZl4+uYdysgWkxwYlnWCaSYE= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 h1:fSV536JiQzMGnP5KxFaNlrtI6bAz5UhZH5P6ZzmGv+U= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 h1:UHBR++/3Kzqnl0W6D47NCExQ5h1SJihJVc/5Tz50x2I= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 h1:VFAz46cR2GSzFUImwfwjRdbX1D4+d/jmjKDAWpdwSss= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 h1:jx1f5fUOwwIBDfjfCtGS4yUvX5lVYoI752LDQXMpKtU= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 h1:SORLgmjd/9vBwWE8LDNbc1C7BvGJao75hoDODgcTF/8= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 h1:lO8+7gtpsPuoszEcs68yJMBGgfunBJMgJs9BbnojeYI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 h1:gw6vmxbZ5gnO4BYn28QXPSnNJc//v+oDumJXlEzGtcM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 h1:PtO6qsHYslf+zE04LYS3zpQ+lqg96q1c95waQn7An6U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 h1:x9g20AqycVZi3iQ/9fqe4KFWUroemGa+/gTGPUr3MCk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 h1:bbRl6VatcjG3nTPf72uD2NK75Ml/HmariKtoft5x2ac= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 h1:U9GPXrKyfQZLtih+iq23sR5wk44DLASb6EhiduOBSf8= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 h1:Gy8KDBQGsfz0xIg3OAbgntthSNHYnWAxdx8IGwrP+kc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 h1:Ed5IG2JXCa1dG9Y3Pgbhw+6TN2Kze7XRwchf7U02ovE= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= From 40e311640d814e0f7673cee075d40ce28e7f06c5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:18 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../util/operationexecutor/node_expander.go | 2 +- .../operationexecutor/operation_generator.go | 5 + .../kubernetes/pkg/volume/util/resize_util.go | 21 ++++ vendor/modules.txt | 118 +++++++++--------- 4 files changed, 86 insertions(+), 60 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go index fff1760d0f..fb4366df06 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go @@ -184,7 +184,7 @@ func (ne *NodeExpander) expandOnPlugin() (bool, resource.Quantity, error) { } // File system resize succeeded, now update the PVC's Capacity to match the PV's - ne.pvc, err = util.MarkFSResizeFinished(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient) + ne.pvc, err = util.MarkNodeExpansionFinishedWithRecovery(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient) if err != nil { return true, ne.pluginResizeOpts.NewSize, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %w", err) } diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go index 5523b61a5e..7b8a765583 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go @@ -2075,6 +2075,11 @@ func (og *operationGenerator) checkForRecoveryFromExpansion(pvc *v1.PersistentVo featureGateStatus := utilfeature.DefaultFeatureGate.Enabled(features.RecoverVolumeExpansionFailure) if !featureGateStatus { + // even though RecoverVolumeExpansionFailure feature-gate is disabled, we should consider it enabled + // if resizeStatus is not empty or allocatedresources is set + if resizeStatus != "" || allocatedResource != nil { + return true + } return false } diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go index 2bf54b4b85..599f220976 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go @@ -236,6 +236,27 @@ func MarkFSResizeFinished( return updatedPVC, err } +func MarkNodeExpansionFinishedWithRecovery( + pvc *v1.PersistentVolumeClaim, + newSize resource.Quantity, + kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) { + newPVC := pvc.DeepCopy() + + newPVC.Status.Capacity[v1.ResourceStorage] = newSize + + allocatedResourceStatusMap := newPVC.Status.AllocatedResourceStatuses + delete(allocatedResourceStatusMap, v1.ResourceStorage) + if len(allocatedResourceStatusMap) == 0 { + newPVC.Status.AllocatedResourceStatuses = nil + } else { + newPVC.Status.AllocatedResourceStatuses = allocatedResourceStatusMap + } + + newPVC = MergeResizeConditionOnPVC(newPVC, []v1.PersistentVolumeClaimCondition{}, false /* keepOldResizeConditions */) + updatedPVC, err := PatchPVCStatus(pvc /*oldPVC*/, newPVC, kubeClient) + return updatedPVC, err +} + // MarkNodeExpansionInfeasible marks a PVC for node expansion as failed. Kubelet should not retry expansion // of volumes which are in failed state. func MarkNodeExpansionInfeasible(pvc *v1.PersistentVolumeClaim, kubeClient clientset.Interface, err error) (*v1.PersistentVolumeClaim, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index d375810256..49b1858c25 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1167,7 +1167,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1228,7 +1228,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1275,7 +1275,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1347,7 +1347,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1528,13 +1528,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1898,7 +1898,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1917,14 +1917,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-20250505182703-f6cfe0c54a1f +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1961,7 +1961,7 @@ k8s.io/component-base/version/verflag k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz k8s.io/component-base/zpages/statusz -# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1975,7 +1975,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1992,35 +1992,35 @@ 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-20250505182703-f6cfe0c54a1f +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache k8s.io/endpointslice/trafficdist k8s.io/endpointslice/util -# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/externaljwt/apis/v1alpha1 # k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 @@ -2041,13 +2041,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2080,7 +2080,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f @@ -2113,11 +2113,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-20250505182703-f6cfe0c54a1f +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2152,7 +2152,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2174,7 +2174,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.32.2 => github.com/openshift/kubernetes v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2995,7 +2995,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3010,10 +3010,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-20250505182703-f6cfe0c54a1f +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3160,39 +3160,39 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250515122228-9fe7dfdeb671 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 From a938d18a9e7c34dbb672500b2012e782ffada638 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:18 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 64 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 +++++++++++------------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index df75281a97..a79b383933 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,39 +150,39 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index a96cf984ba..1facf73218 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -174,20 +174,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:19aSm0 github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:fmcuY5R2SNkklU4+fKVBQi2biVp5vafMrWUEj4TJ4Cs= github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:C/8cEHhZcK1VdHUZyYzgTtT84E7Tji1qlebb8SUnhqA= github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:G1mOzdwuzKT1VRL7SqRchli/qcFrtLBTAQ4lV20sXXo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f h1:ZUsjiuVb+71CKTeBpzeFT+IDAM5KpwrK4BK82ZkpNOM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f h1:hDmE6Vy+KrqwG7ZCApf0B/7qWPHb0cq18RXaXYI+al0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f h1:Y/D7Hn6z/EcwjgwVEfbwjPAPiX0WMoSL86Ix86qNwqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f h1:s508PYk3/HqDtj/YxFIL3Hc593X/UGobA/x6EHz2mOo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f h1:l2Wtx1MJlFKyRiUtDu9z01n1WrNoXFsJp4VlXmJKkG8= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f h1:lqkYTljOcm+6r5jmBAgrmH+cDrd0ALjA3LBgN94AhJg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f h1:JrAbpWFldn/KqtPSsBuB4rNP/7vehP9fJH9AJX+zPe4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 h1:uCZwPW8FLaTkv453Z6kZt/rPkK7c/uWId1+wS25BTg0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 h1:hNYsvZPQTkSEwIwxxIEcwiDRDxHbbXBV+EAvrGkDuw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 h1:SElwMXEjUWp8p7us6QBZcbpKJX2NX6lEYUbg+BeUwVw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 h1:VhGuz88yrsNib1tBzotRTPKY16kSijLNTgLqm4fN61U= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 h1:D3s2zwY0TqNe5Uz1FPk6lgtL+fUXjHwrzumtMe0Z1so= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 h1:h4h68kwl89UaWLe9Wkof7/zylfPwDGRTjcFV6a9UXcI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 h1:x9g20AqycVZi3iQ/9fqe4KFWUroemGa+/gTGPUr3MCk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= From 6ffe38ce286ff8b95bc8fde26aa117bd1e1cc17d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:25 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../openshift/microshift/pkg/util/net.go | 27 ++++++- etcd/vendor/modules.txt | 78 +++++++++---------- 2 files changed, 64 insertions(+), 41 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go index 2cd9a8e8cc..188b01cb39 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go @@ -18,6 +18,7 @@ package util import ( "context" "crypto/tls" + "crypto/x509" "fmt" tcpnet "net" "net/http" @@ -83,12 +84,34 @@ found: } func RetryInsecureGet(ctx context.Context, url string) int { + return RetryGet(ctx, url, "") +} + +func RetryGet(ctx context.Context, url, additionalCAPath string) int { + rootCAs, err := x509.SystemCertPool() + if err != nil { + klog.Infof("Warning: Failed to load system CA certificates: %v. Creating an empty pool.", err) + rootCAs = x509.NewCertPool() + } + if additionalCAPath != "" { + caCert, err := os.ReadFile(additionalCAPath) + if err != nil { + klog.Errorf("failed to read CA certificate %s: %v", additionalCAPath, err) + return 0 + } + + if !rootCAs.AppendCertsFromPEM(caCert) { + klog.Errorf("failed to append CA certificate %s to pool", additionalCAPath) + return 0 + } + } status := 0 - err := wait.PollUntilContextTimeout(ctx, 5*time.Second, 120*time.Second, false, func(ctx context.Context) (bool, error) { + err = wait.PollUntilContextTimeout(ctx, 5*time.Second, 120*time.Second, false, func(ctx context.Context) (bool, error) { c := http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: true, //nolint:gosec + RootCAs: rootCAs, + MinVersion: tls.VersionTLS12, }, }, } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index a795b6ac01..7c1f71aecc 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -631,7 +631,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -692,7 +692,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -754,18 +754,18 @@ 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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -924,7 +924,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -961,7 +961,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-20250505182703-f6cfe0c54a1f +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1084,35 +1084,35 @@ sigs.k8s.io/yaml/goyaml.v3 # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505182703-f6cfe0c54a1f -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505182703-f6cfe0c54a1f +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250515122228-9fe7dfdeb671 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250515122228-9fe7dfdeb671 From 7f9c1d9160c2f37c65fee81bac7deaaa0100a798 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:25 +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 cc001fb51c..c829ed6dbd 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -24,6 +24,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:7d5dcf3c628bec298657e069b6c3b45c3d7ee72c662af841aa6af8d547b88a1e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a987957daf4697da6c43a704a21717f993c38f2f57a6bd20f48b9d79a1fe35e" 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 6be54959b6..27417bf2d4 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -24,6 +24,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:423d1446836c18dfe8e6fcf355ae8b692f7544d53c6722e4b719b35f896b20c6" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:981507a4d939fe8eaf21b522165d2172f8e6620017870f077476648e7569a65f" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 8528e1fd9c28baaffd59c028bc287e696222c5dc Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:26 +0000 Subject: [PATCH 8/9] update manifests --- assets/components/multus/release-multus-aarch64.json | 2 +- assets/components/multus/release-multus-x86_64.json | 2 +- assets/optional/kube-proxy/kustomization.aarch64.yaml | 2 +- assets/optional/kube-proxy/kustomization.x86_64.yaml | 2 +- .../optional/kube-proxy/release-kube-proxy-aarch64.json | 4 ++-- assets/optional/kube-proxy/release-kube-proxy-x86_64.json | 4 ++-- .../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 | 6 +++--- assets/release/release-x86_64.json | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 2c7c66e7a3..6863a3adc9 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-05-13-055933" + "base": "4.19.0-0.nightly-arm64-2025-05-19-055614" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2582472d0709decafb10bc2fcfdf335f5f31440b7798041ec513cf6d11990423", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index bad58a0a88..19747e6664 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2025-05-13-053644" + "base": "4.19.0-0.nightly-2025-05-19-005500" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47addc7ce15bb92875408cad14e52c62d093f1df5220870e9ceb30bf20441828", diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml index 024c40a4a4..db597ac7c1 100644 --- a/assets/optional/kube-proxy/kustomization.aarch64.yaml +++ b/assets/optional/kube-proxy/kustomization.aarch64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e70869d686f1cfc362e436a6ad345454831da600aeeda13f0ac10ff7ed6d0f22 + digest: sha256:c94f2a75742b73b76670f472ea2153fa418bee1addd352cdc524bff694ccd432 diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml index c7f0dd8532..bef8ffec10 100644 --- a/assets/optional/kube-proxy/kustomization.x86_64.yaml +++ b/assets/optional/kube-proxy/kustomization.x86_64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1a03f9178eb1180f8c4c3a30c63fca982f02591f9f6dda5b8bf192588354bd8a + digest: sha256:f745b73b644e668db50d4c1b7dbed57b0f838607a9b2fcf5555bc3a7ce92f165 diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index d3b34d08ef..3ad0a915f5 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-05-13-055933" + "base": "4.19.0-0.nightly-arm64-2025-05-19-055614" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e70869d686f1cfc362e436a6ad345454831da600aeeda13f0ac10ff7ed6d0f22" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c94f2a75742b73b76670f472ea2153fa418bee1addd352cdc524bff694ccd432" } } diff --git a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json index 848be9936f..f0e2195f5e 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.19.0-0.nightly-2025-05-13-053644" + "base": "4.19.0-0.nightly-2025-05-19-005500" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a03f9178eb1180f8c4c3a30c63fca982f02591f9f6dda5b8bf192588354bd8a" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f745b73b644e668db50d4c1b7dbed57b0f838607a9b2fcf5555bc3a7ce92f165" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index b390456b69..c576cc287d 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:f53356f939362aba9a18955d238160b5cbfe25c8b4b24ff577be73486985a042 + digest: sha256:312f3ca5a6fa0a28319e49177af3b51fac908e2fff373834c9793b8299f83d66 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f41de2d22f0b1e8ea6422849a410dbce8d567374779d9a7f3b9a87cfa2b970f6 + digest: sha256:61f004b46451eac413bbc2884263d0468b8b09bfc0c266d931bbeb8f34a399ec - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:fdca01d9ef6625903a62a7e96194a7771e35e758a8e8ee0604196288f2099600 @@ -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:f41de2d22f0b1e8ea6422849a410dbce8d567374779d9a7f3b9a87cfa2b970f6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61f004b46451eac413bbc2884263d0468b8b09bfc0c266d931bbeb8f34a399ec - 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:f53356f939362aba9a18955d238160b5cbfe25c8b4b24ff577be73486985a042 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:312f3ca5a6fa0a28319e49177af3b51fac908e2fff373834c9793b8299f83d66 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 1b62a29cd6..b2b0d8214f 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:fb7ed534be9a37a73aedee69c8d4c35315932722dae5b04439a0084aa19f14ed + digest: sha256:b78016da951ee937198e3db08c37b56faac19ae6f37fa1f3124d0ef84c990008 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ab64c0c2af0ff61bb9fbbdfbb7866e40f072eacf584f02036b5ebe321cedc418 + digest: sha256:95e6aed113b859fd458fb2d45ab53a55969ce3e02f45e0089e8ca4ea4c44f6a9 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:6d2be2dee342848845a02462e5e1b9b2354ae6f96e15a60e0a154105fc159e5b @@ -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:ab64c0c2af0ff61bb9fbbdfbb7866e40f072eacf584f02036b5ebe321cedc418 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95e6aed113b859fd458fb2d45ab53a55969ce3e02f45e0089e8ca4ea4c44f6a9 - 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:fb7ed534be9a37a73aedee69c8d4c35315932722dae5b04439a0084aa19f14ed + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78016da951ee937198e3db08c37b56faac19ae6f37fa1f3124d0ef84c990008 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 985f4c6324..d62c472997 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.19.0-0.nightly-arm64-2025-05-13-055933" + "base": "4.19.0-0.nightly-arm64-2025-05-19-055614" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f53356f939362aba9a18955d238160b5cbfe25c8b4b24ff577be73486985a042", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f41de2d22f0b1e8ea6422849a410dbce8d567374779d9a7f3b9a87cfa2b970f6", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:312f3ca5a6fa0a28319e49177af3b51fac908e2fff373834c9793b8299f83d66", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61f004b46451eac413bbc2884263d0468b8b09bfc0c266d931bbeb8f34a399ec", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdca01d9ef6625903a62a7e96194a7771e35e758a8e8ee0604196288f2099600" } } 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 6af2f8dba9..c3869b7cdb 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.19.0-0.nightly-2025-05-13-053644" + "base": "4.19.0-0.nightly-2025-05-19-005500" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb7ed534be9a37a73aedee69c8d4c35315932722dae5b04439a0084aa19f14ed", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab64c0c2af0ff61bb9fbbdfbb7866e40f072eacf584f02036b5ebe321cedc418", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78016da951ee937198e3db08c37b56faac19ae6f37fa1f3124d0ef84c990008", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95e6aed113b859fd458fb2d45ab53a55969ce3e02f45e0089e8ca4ea4c44f6a9", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d2be2dee342848845a02462e5e1b9b2354ae6f96e15a60e0a154105fc159e5b" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d752cbde0d..18f1328d98 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-05-13-055933" + "base": "4.19.0-0.nightly-arm64-2025-05-19-055614" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d36368611a5b5c96e7787453703a3b18183ae7f034516c412553801a415b4b6", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f520aa7e8e8d19dcc6e6b2d443ac6aec81fbab7fab3619d1f3d5377d1c6d72f9", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:550ff009c4154ea6cf5796c2b4c2ddd58210b08ff18da2e46e0269d889c296f6", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6fc04a20f35a98ca47e80ae221a83ac29b3957e900b71ffbaacd4f5531760fa", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdca01d9ef6625903a62a7e96194a7771e35e758a8e8ee0604196288f2099600", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25bce83eb365ee24348c9df9b1bdb0ebaebe69d008782c35f3058f7decdfd6c1", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:423d1446836c18dfe8e6fcf355ae8b692f7544d53c6722e4b719b35f896b20c6", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:981507a4d939fe8eaf21b522165d2172f8e6620017870f077476648e7569a65f", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:776933016e74af637b50003f0846b9babcadd1325a5f64b2d368a734ff3dfb32", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:072b28dc4bcd6c07f8c23210bb776912791c33f046dc5665ca6956199661a43a" diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 201ea3c071..e695314c42 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.19.0-0.nightly-2025-05-13-053644" + "base": "4.19.0-0.nightly-2025-05-19-005500" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf083b5f1ae54847c78ae4be4373cab56405aaf445c8a902c11f063c42352e57", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad13015b402218bd4e2d2625a0042f7d56f3c4e60cdae58821c9f99b3414f6a0", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09212648c75b0bdff049de3aadc1bdfd66aa2da2c79cbc05af16d0c323d942a9", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74b6dfcbc76809ef6859567ceee7861fc3b696cb47c2053c85cbb54360eb47bd", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d2be2dee342848845a02462e5e1b9b2354ae6f96e15a60e0a154105fc159e5b", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9775db38ca12acf04d42d0212c7f46f55cb2a4dbbe2a79e2cf86c371e67db1b3", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d5dcf3c628bec298657e069b6c3b45c3d7ee72c662af841aa6af8d547b88a1e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a987957daf4697da6c43a704a21717f993c38f2f57a6bd20f48b9d79a1fe35e", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c21a1e657307d0e7d656901d6e6ca848a19939aa2381046a99893cc002d67c84", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67c5b80faa380e21201e248289250773270362b9cd098421493d4a23c58ff709" From 54c643067b6a6094211ed9ac63a9c87034579aad Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 20 May 2025 04:31:27 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 780bbef79e..8f99f39bde 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.4 -KUBE_GIT_COMMIT=f6cfe0c54a1fa9314c65e30c613df641c7226ed0 +KUBE_GIT_COMMIT=9fe7dfdeb6714effef45be12ec451a0f06893660 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 5ce065b385..1eb4ecb229 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-05-13-055933 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-05-19-055614 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index b152ecd766..1ac73e3c8c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-05-13-053644 +OCP_VERSION := 4.19.0-0.nightly-2025-05-19-005500