From 3896774a3df69a8a1dd1f38193386e57188ed3ea Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:28:47 +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 e994fbaf25..2e259371d7 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.15.0-0.nightly-2025-03-06-152934" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2025-03-06-143344" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2025-04-02-090624" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2025-04-02-132821" From b1dceebd2df32703e19661a4613c81a30b0f8e6b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:28:48 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 31 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 14 +++++++------- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..a939e09735 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,31 @@ +- cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 to 73aa60d1fd4e86aed93d67ddac62586ecbb70644 + - b68567f 2025-02-26T15:01:43+01:00 Add runbook-url for CoreDNSErrorsHigh + +- cluster-network-operator embedded-component d69278e76edaa4fcde0c9c78edd686fecad16a95 to 20786bb70ae9a238f0673b3fbf1f90e25df659ab + - 8636568 2025-03-19T01:49:27+00:00 Not update status.migration of the network.config CR to empty + - 369c045 2025-02-26T07:39:54-05:00 Use applyconfigurations for updating network.oprerator status + - 0ffe372 2025-02-26T07:39:35-05:00 Vendor fake client-go operator client + +- kubernetes embedded-component ff493be70058d7324491442be6d57c92cfccb92d to f3836777163e6444ad9116dbcba70a6b8cce9d50 + - c4bbd4265 2025-03-26T11:28:31+01:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 2ba22a0e3 2025-03-14T11:00:15+01:00 UPSTREAM: 129180: prevent unnecessary resolving of iscsi/fc devices to dm + +- machine-config-operator embedded-component 9040a70ce67b34643aa4fd17dece6a9b65a48d95 to d6c08256872b54e79fc00fa2c280b626d23bd276 + - 9a999d58 2025-03-24T18:56:50+00:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector + - 04f81f1d 2025-03-24T18:49:24+00:00 daemon & server: update log verbs + - cabbd67d 2024-10-26T05:19:35+00:00 OCPBUGS-43428: Soften haproxy timeout for kubeapi probe + +- operator-framework-olm embedded-component ba9df23efe901d3e5e8e0d51fcf378b20a622fd3 to 7788801d7846a1f898c0e583583a73e937147164 + - 8c301326 2025-01-29T10:22:17+01:00 [CARRY] address lint issues in namespace labeler plugin + - 385eb211 2025-01-29T10:22:17+01:00 [CARRY] fixup ns labeler plugin + - 2c4ce67b 2025-01-29T10:22:16+01:00 :bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483) + - 697e7c8b 2025-01-29T10:20:37+01:00 Add finalizer for CSV cleanup (#3148) + +- kubernetes image-amd64 ff493be70058d7324491442be6d57c92cfccb92d to f3836777163e6444ad9116dbcba70a6b8cce9d50 + - c4bbd4265 2025-03-26T11:28:31+01:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 2ba22a0e3 2025-03-14T11:00:15+01:00 UPSTREAM: 129180: prevent unnecessary resolving of iscsi/fc devices to dm + +- kubernetes image-arm64 ff493be70058d7324491442be6d57c92cfccb92d to f3836777163e6444ad9116dbcba70a6b8cce9d50 + - c4bbd4265 2025-03-26T11:28:31+01:00 UPSTREAM: 129011: skip TestCreateBlobDisk test + - 2ba22a0e3 2025-03-14T11:00:15+01:00 UPSTREAM: 129180: prevent unnecessary resolving of iscsi/fc devices to dm + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index c231ed7698..7c866e5a6e 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,19 +1,19 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 65dbb12b710b7126f662f5f7f2d8272f9f6868cc -https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 +https://github.com/openshift/cluster-dns-operator embedded-component 73aa60d1fd4e86aed93d67ddac62586ecbb70644 https://github.com/openshift/cluster-ingress-operator embedded-component 9e0d092565a4589dbcbafb7b1212651afa6d36fa https://github.com/openshift/cluster-kube-apiserver-operator embedded-component b5b212e5cecf729bb15248d26edbd55dbe7253a9 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 -https://github.com/openshift/cluster-network-operator embedded-component d69278e76edaa4fcde0c9c78edd686fecad16a95 +https://github.com/openshift/cluster-network-operator embedded-component 20786bb70ae9a238f0673b3fbf1f90e25df659ab https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 1ae0ba75cfdb910990437ab2898690b9e3f8f94a https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd -https://github.com/openshift/kubernetes embedded-component ff493be70058d7324491442be6d57c92cfccb92d +https://github.com/openshift/kubernetes embedded-component f3836777163e6444ad9116dbcba70a6b8cce9d50 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component 9040a70ce67b34643aa4fd17dece6a9b65a48d95 +https://github.com/openshift/machine-config-operator embedded-component d6c08256872b54e79fc00fa2c280b626d23bd276 https://github.com/openshift/openshift-controller-manager embedded-component ff69ddfb8f9c752f77e96e867f667e5b8c149935 -https://github.com/openshift/operator-framework-olm embedded-component ba9df23efe901d3e5e8e0d51fcf378b20a622fd3 +https://github.com/openshift/operator-framework-olm embedded-component 7788801d7846a1f898c0e583583a73e937147164 https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-amd64 82316376e25f6453b58258df6bf1e11ec4abb670 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd1 https://github.com/openshift/router image-amd64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3 https://github.com/openshift/kube-rbac-proxy image-amd64 9308e7f2a6d984fa7b8ddc125524d7b7356f92ce https://github.com/openshift/ovn-kubernetes image-amd64 01af23cb323ec1506b5faf23e3e0d3b59df24fc8 -https://github.com/openshift/kubernetes image-amd64 ff493be70058d7324491442be6d57c92cfccb92d +https://github.com/openshift/kubernetes image-amd64 f3836777163e6444ad9116dbcba70a6b8cce9d50 https://github.com/openshift/service-ca-operator image-amd64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-arm64 82316376e25f6453b58258df6bf1e11ec4abb670 https://github.com/openshift/coredns image-arm64 1326282c9e158078634be4261b75ded247d233d7 @@ -34,5 +34,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd1 https://github.com/openshift/router image-arm64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3 https://github.com/openshift/kube-rbac-proxy image-arm64 9308e7f2a6d984fa7b8ddc125524d7b7356f92ce https://github.com/openshift/ovn-kubernetes image-arm64 01af23cb323ec1506b5faf23e3e0d3b59df24fc8 -https://github.com/openshift/kubernetes image-arm64 ff493be70058d7324491442be6d57c92cfccb92d +https://github.com/openshift/kubernetes image-arm64 f3836777163e6444ad9116dbcba70a6b8cce9d50 https://github.com/openshift/service-ca-operator image-arm64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 From f7cd439b1556a83362249f3a6df6eb24b2080f73 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:29:29 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 62 +++++++++++++++++----------------- go.sum | 104 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index 397944170b..699d84c405 100644 --- a/go.mod +++ b/go.mod @@ -237,36 +237,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241123031113-ff493be70058 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241123031113-ff493be70058 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250401122453-f3836777163e // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250401122453-f3836777163e // from kubernetes ) replace ( @@ -277,4 +277,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 // 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-20241123031113-ff493be70058 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e // staging kubernetes diff --git a/go.sum b/go.sum index c42aeaa0e2..d52d5f43c9 100644 --- a/go.sum +++ b/go.sum @@ -531,60 +531,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:w/Et0E3LO3/e0MLw7sPUfVzAQYHD6/XesVGyn3xE6NY= github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/kubernetes v0.0.0-20241123031113-ff493be70058 h1:T0k/fdoYiN+rqjZoMgz56RZrGOHn7H0EqyRxol5bAR0= -github.com/openshift/kubernetes v0.0.0-20241123031113-ff493be70058/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ= +github.com/openshift/kubernetes v0.0.0-20250401122453-f3836777163e h1:iHR7XK7+v8MPY0tyeacDnbGJTfJBSr5Pg5nlIlme7pE= +github.com/openshift/kubernetes v0.0.0-20250401122453-f3836777163e/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 h1:dFt4v5LeBJ4Ohf9oaZ5tce37PPGAeZ4sdbDIeW3R2qo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 h1:lBKruxG7/xnfGpYSxGGr57NmH2b1uEsW5YlrYHLsZoc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 h1:DkelDrNgNc78LGJkyy+Pdp1/L+UjjIY/iytgX2jXEy0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 h1:4LHmrza2tGFE9m1y0eBVOP/C81HSpVAUJgTOwALr/f4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 h1:ErAt8UUQjp3XXAi8lKIOzgo3iih1jIJAZK4TkOchzYE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 h1:vas7RYTuH/U5T57Otx7c0Pjbp9JDn8y8P/k+T6SCCYM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 h1:eMocKQRAQs4xj7nZohTbCjisBVLdmnFdRh0GaaNtDfs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 h1:Z9JSKSZxOrrgl8WUai9ZAqYTiXZu6oBPgU/TAPakxfs= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058 h1:t/7F1BU7dIZ4HDNoOnSJ97T51S/lB9ZwEWV9ghqO2Go= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 h1:xQ1wOUpipTva8MCr9q9dB3j6DgJDf+AVGdLEEBaxiQQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 h1:eqq4vfDdY3Xw7w49bBUn5/jAV9z8mCxI/9zVnJIsSnc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 h1:ZzJ7jRXybMPQdc8Zvc49LTnyQHjOZZp4Elbn6VbfCn4= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 h1:nQk97TtoGpiXs0z5NIM/GP4feIeCvc3XeimoR9Q04zU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 h1:111HfPWvLr+EUbASr72yq4Gxd37KARavBOr/vTycMac= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058 h1:vVfwPUclBv4zq/PqkiJxQOlKiFW8ahM1In8p4Zp0RYM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058 h1:Hd4wX0kXBCEXq1OxH2hllnILr2x4A/tJ8ugvzgiGUlE= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 h1:dmJzFVf8CxtU+8g4K28bXJ9TYI3hdsaqh6cVtBpOO2Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 h1:8gAVaigZF7iB+BtiQqbXf+26sVAvlAAeRYnBAfHdn/I= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 h1:CpmbLpvgvvA3ASHocqaX9j6e467DXq7hAdzk5OMYsjg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058 h1:f7ZcxFMw70579aCMEvXZVh7wjJNQyyQCqZjyAd8ecuo= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 h1:yFWx4sO+/SCCWQLm74oN0CQ73kMmZLLNAlkoFuqs33k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 h1:ex5BPBoNwhXWTtvJnlkIm0pan8ywa4Mc2nqHsmurwV4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 h1:dg+TFntNAkpjtO3D5H1CE/0sIV1od54REy4aRvBdggI= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 h1:sdmH2C4RXg/OOZ6/VFVNi3bVl0MVOLv5guRdaSyJaE8= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058 h1:5a5KQhqQxBqh/PfGgrm8alRwaHtsgOrZJUTqNw26m/E= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 h1:H6wVhQgLBKBikOvc+0ykNG8Lqq8P/Icv3xdMxx1Iyh0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e h1:cD+9/RMc9l22J0EGfqcVy/zbF5LX21cmSZXhL6B2uLo= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e h1:3rpzQ5dR62TVR9Ztxg6kP4INJph9J/cwXPPqy5IzZGc= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e h1:gMOM3EmZBaucDfECmAmVnwtTd2lRzGNVGgBHPMlDeW0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e h1:okGOnMkooyIem9JhaRQ3MpaIrLWYReOkyCpOU7R6puU= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e h1:ibTzTCUtlPd/WvhJxO/GOEiA7Xm+TAikfP+yszmz0kY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e h1:sXiWDBL9CmMAqFMoNRDyvMBh85yFoBgV1r5melvegLk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e h1:BQaYuYrRzphqWRP6Xdqn3EshU7PEEyNx8MTdpDTQ5js= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e h1:4M6fFuL8DNKVMFGRaUvbHrHlTK4o5zfyMtiKL06bJbw= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e h1:XGQYIBovAtTbNFl7yYEv/CFhe1pU4jcO3ob5Xtm6N+I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e h1:/S/9L75h926U7NJg2sghiZ/HC/A2kPMFwRbGQYscqkY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e h1:YHPsscoViZn9C5fPLs0UVcOJrU8ZuC3jd8buii3VwPI= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e h1:ljYP+44sLZjKZpI/n8knZwHU3V+IAT8ul5j8i4PziaU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e h1:fd7F6QyYWs/BTxxozUvp5p17FkJ9mQsjWzNSDjEq8Tg= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e h1:mSnt5vwgg/MrpXi4NN0tMv5tttZ3dQbcYb5PDu/aIr0= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e h1:iE+db46/ttoRtzRavv8Hlc6GE3FocmTjSihLbrrpQ3A= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e h1:zm5mfyzJUO7G2JMZdqkrYRJ+e+7gt3fTKt0r+l+zpF0= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e h1:Uz6NLYAJuueU7S+f+zR4KXLGauqgEoDy2mC7WyAMxe4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e h1:WsaHrWHc9AL8OSCRrDuw5jzcZdJg/T6/0ziKdEABGGw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e h1:HTubyeWEVL8N4swmxkbHqMXEklJV1jQ2ZDhbBo0W20E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e h1:vFx14LstfIBf+T2ek/luCNQprU48cdL72zJhOp2IxwU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e h1:22p/47pQJSD8pZrg3TpO3NnWGX0qQP6U579W+iXhm7o= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e h1:g7BZ3dFgd2Jgc0iw9hJo5KR0JZAxuNyQheOpkxDKNLU= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e h1:QG759QhEh4VPTJjm0M5k3gQWFPRfFXK+CnekGOPC0xg= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e h1:nwSO3AEGVtb/6in+uj2gL3z8ABWL2MuEYov3sSmM35U= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e h1:GqgETvkNFODtVeXIdDNRVr7Lbc8rDI9+2BNKC1sAvtg= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7/go.mod h1:jgxNp8aApJnZtECid9SUSr5Bu6DLo8Hfdv1DgFZaYA8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= From 595af7994545193b8057c4e9a7f56d41aca1aed5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:29:59 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../pkg/volume/util/device_util_linux.go | 7 +- vendor/modules.txt | 114 +++++++++--------- 2 files changed, 63 insertions(+), 58 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go index 66ac77835c..18cbec072f 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go @@ -31,8 +31,13 @@ import ( "k8s.io/klog/v2" ) -// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent +// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent. If called with a device +// already resolved to devicemapper, do nothing. func (handler *deviceHandler) FindMultipathDeviceForDevice(device string) string { + if strings.HasPrefix(device, "/dev/dm-") { + return device + } + io := handler.getIo disk, err := findDeviceForPath(device, io) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8921bba4c4..51436ce27e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1363,7 +1363,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1420,7 +1420,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 +# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1467,7 +1467,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1534,7 +1534,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 +# k8s.io/apiserver v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1699,13 +1699,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2042,7 +2042,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 +# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2065,14 +2065,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-20241123031113-ff493be70058 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2106,7 +2106,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 +# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2119,7 +2119,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 +# k8s.io/controller-manager v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2136,19 +2136,19 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 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-20241123031113-ff493be70058 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2170,13 +2170,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 +# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 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.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 +# k8s.io/kube-aggregator v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2207,7 +2207,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 @@ -2240,12 +2240,12 @@ 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-20241123031113-ff493be70058 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2280,7 +2280,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 +# k8s.io/kubelet v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2301,7 +2301,7 @@ k8s.io/kubelet/pkg/apis/stats/v1alpha1 k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand -# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20241123031113-ff493be70058 +# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3106,7 +3106,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3148,7 +3148,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3163,10 +3163,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-20241123031113-ff493be70058 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 +# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3317,38 +3317,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241123031113-ff493be70058 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241123031113-ff493be70058 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241123031113-ff493be70058 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250401122453-f3836777163e +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250401122453-f3836777163e +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250401122453-f3836777163e # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e From 24c5710428fe5b2f5db21dfed4df0a2276a431f6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:29:59 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 60 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 24 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 6a38863996..6db80e3366 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -145,35 +145,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241123031113-ff493be70058 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241123031113-ff493be70058 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250401122453-f3836777163e // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250401122453-f3836777163e // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 3c019d2689..4ec8f3cae5 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -186,18 +186,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:cHzYVq github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:odYEwXTw9Xh+9/jqCPRiS1SMtttO/xJDywbf1rRMe9U= github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 h1:lBKruxG7/xnfGpYSxGGr57NmH2b1uEsW5YlrYHLsZoc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 h1:4LHmrza2tGFE9m1y0eBVOP/C81HSpVAUJgTOwALr/f4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 h1:vas7RYTuH/U5T57Otx7c0Pjbp9JDn8y8P/k+T6SCCYM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 h1:eMocKQRAQs4xj7nZohTbCjisBVLdmnFdRh0GaaNtDfs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 h1:xQ1wOUpipTva8MCr9q9dB3j6DgJDf+AVGdLEEBaxiQQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 h1:yFWx4sO+/SCCWQLm74oN0CQ73kMmZLLNAlkoFuqs33k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e h1:cD+9/RMc9l22J0EGfqcVy/zbF5LX21cmSZXhL6B2uLo= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e h1:gMOM3EmZBaucDfECmAmVnwtTd2lRzGNVGgBHPMlDeW0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e h1:ibTzTCUtlPd/WvhJxO/GOEiA7Xm+TAikfP+yszmz0kY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e h1:sXiWDBL9CmMAqFMoNRDyvMBh85yFoBgV1r5melvegLk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e h1:XGQYIBovAtTbNFl7yYEv/CFhe1pU4jcO3ob5Xtm6N+I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e h1:vFx14LstfIBf+T2ek/luCNQprU48cdL72zJhOp2IxwU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= From ec11b7f5196785c0176419249932de343a9f7573 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:30:04 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 72 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 0dc2e35c6b..99748a284a 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -598,7 +598,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -655,7 +655,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -708,13 +708,13 @@ 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -860,7 +860,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -897,7 +897,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-20241123031113-ff493be70058 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1025,33 +1025,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241123031113-ff493be70058 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241123031113-ff493be70058 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241123031113-ff493be70058 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241123031113-ff493be70058 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241123031113-ff493be70058 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241123031113-ff493be70058 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241123031113-ff493be70058 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241123031113-ff493be70058 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241123031113-ff493be70058 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241123031113-ff493be70058 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241123031113-ff493be70058 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241123031113-ff493be70058 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241123031113-ff493be70058 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241123031113-ff493be70058 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241123031113-ff493be70058 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241123031113-ff493be70058 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241123031113-ff493be70058 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241123031113-ff493be70058 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241123031113-ff493be70058 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241123031113-ff493be70058 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241123031113-ff493be70058 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241123031113-ff493be70058 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241123031113-ff493be70058 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250401122453-f3836777163e +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250401122453-f3836777163e +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250401122453-f3836777163e +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250401122453-f3836777163e +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250401122453-f3836777163e +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250401122453-f3836777163e +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250401122453-f3836777163e +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250401122453-f3836777163e +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250401122453-f3836777163e +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250401122453-f3836777163e +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250401122453-f3836777163e +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250401122453-f3836777163e +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250401122453-f3836777163e +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250401122453-f3836777163e +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250401122453-f3836777163e +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250401122453-f3836777163e +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250401122453-f3836777163e +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250401122453-f3836777163e +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250401122453-f3836777163e +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250401122453-f3836777163e +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250401122453-f3836777163e +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250401122453-f3836777163e +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250401122453-f3836777163e From 2dcf7b3740f95bb13b4ced8cac18683d86020186 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:30:05 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 2d47992027..414dee3093 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e050375c4988a59033b3fd1ed02595242067b9fbc6dd469f5ecdd16e28ab720e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:786bd089e8faf171ae9bce483227ddb9ffe35b4ff12c5f9bc4946ef8cc49a354" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index a59ae7ba53..3ca96e5412 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58e5e79f7c3fe492ccbfbabb0902e11f58c472b86624edd6eb21717e8ba783bc" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61ae06135cf3ca9082daf51f49c192c033e91fc6dff17acc7d6f29733cce7c8c" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 9e9792f78676c361794a45f1c95fdf5f6ab0c486 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:30:07 +0000 Subject: [PATCH 8/9] update manifests --- .../kustomization.aarch64.yaml | 10 ++++----- .../kustomization.x86_64.yaml | 10 ++++----- .../release-olm-aarch64.json | 8 +++---- .../release-olm-x86_64.json | 8 +++---- assets/release/release-aarch64.json | 22 +++++++++---------- assets/release/release-x86_64.json | 22 +++++++++---------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 25152683e1..41fddbf46e 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6cfd6e92b2daf7ba81ba8c19aa1b94c58f58d5c62a606b07fb77297c152958b5 + digest: sha256:0d10050f8a39eba48e27b60b8495ea8fa627c59e036bb073fcaee78b53dddf83 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c7045f6a517fc45d152b61aa3b58f1134a6c47a233f64761d411b88802b03701 + digest: sha256:bb6cc7af6376a96a8d637343b6124321749fbdf99cdba6d0603a2c25aef6f646 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:13eb64ef387a6e05513ad85c0c03d707a0511544bef1ae7e3ca7714260956a34 + digest: sha256:c1db078026712a2fa084c2879230ab71555aa77ffdc9105e514caf1c10666408 patches: - patch: |- @@ -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:c7045f6a517fc45d152b61aa3b58f1134a6c47a233f64761d411b88802b03701 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb6cc7af6376a96a8d637343b6124321749fbdf99cdba6d0603a2c25aef6f646 - 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:6cfd6e92b2daf7ba81ba8c19aa1b94c58f58d5c62a606b07fb77297c152958b5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d10050f8a39eba48e27b60b8495ea8fa627c59e036bb073fcaee78b53dddf83 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 ed3b10bbdf..02983e72fa 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9b89f277cfce52442395518e637d8fe4d3009fadc4e86185cf6a3790ba9e4db2 + digest: sha256:d0aa73a42c2675a9b1fcd5fcb7bd72acfb2a213f813ffbe595bf894083f8b26d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c637cbe5fc9e2bb5730879f4d659be3283237817fa49d94eef63f705d58d2710 + digest: sha256:357d349d5bea88f4cdd8eaaba95fb2b5554283972ec70f9fadf506d3c803b613 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:441c0b0ab8256ed84483b5f793a72fef09db5ace0417410090371c412250a668 + digest: sha256:da4f1b989f23bfefa817e77970cf0f900e17b2bac3827cdd74e45b1e493ad456 patches: - patch: |- @@ -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:c637cbe5fc9e2bb5730879f4d659be3283237817fa49d94eef63f705d58d2710 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:357d349d5bea88f4cdd8eaaba95fb2b5554283972ec70f9fadf506d3c803b613 - 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:9b89f277cfce52442395518e637d8fe4d3009fadc4e86185cf6a3790ba9e4db2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0aa73a42c2675a9b1fcd5fcb7bd72acfb2a213f813ffbe595bf894083f8b26d 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 aac92d5bb5..db698a49d2 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.15.0-0.nightly-arm64-2025-03-06-143344" + "base": "4.15.0-0.nightly-arm64-2025-04-02-132821" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cfd6e92b2daf7ba81ba8c19aa1b94c58f58d5c62a606b07fb77297c152958b5", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7045f6a517fc45d152b61aa3b58f1134a6c47a233f64761d411b88802b03701", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13eb64ef387a6e05513ad85c0c03d707a0511544bef1ae7e3ca7714260956a34" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d10050f8a39eba48e27b60b8495ea8fa627c59e036bb073fcaee78b53dddf83", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb6cc7af6376a96a8d637343b6124321749fbdf99cdba6d0603a2c25aef6f646", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1db078026712a2fa084c2879230ab71555aa77ffdc9105e514caf1c10666408" } } 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 79b0900e83..11710709a5 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.15.0-0.nightly-2025-03-06-152934" + "base": "4.15.0-0.nightly-2025-04-02-090624" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b89f277cfce52442395518e637d8fe4d3009fadc4e86185cf6a3790ba9e4db2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c637cbe5fc9e2bb5730879f4d659be3283237817fa49d94eef63f705d58d2710", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441c0b0ab8256ed84483b5f793a72fef09db5ace0417410090371c412250a668" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0aa73a42c2675a9b1fcd5fcb7bd72acfb2a213f813ffbe595bf894083f8b26d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:357d349d5bea88f4cdd8eaaba95fb2b5554283972ec70f9fadf506d3c803b613", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da4f1b989f23bfefa817e77970cf0f900e17b2bac3827cdd74e45b1e493ad456" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 397c3765e7..59cfdcda56 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2025-03-06-143344" + "base": "4.15.0-0.nightly-arm64-2025-04-02-132821" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24b00083d3f62ff1f179253fc117f72363c5275e5dcb1f634658e47ad52827ac", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6e7ac197f059003f67bc235f205a6148fe9ca3dd747c8a1b7db79074fd7c19", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cf7ad416f78e5d85469185b7da02a4196a3daba19e8f2ae3a20a8720c05ee8e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13eb64ef387a6e05513ad85c0c03d707a0511544bef1ae7e3ca7714260956a34", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc146a72d9f5b62fe361ec8fcc0c8861b7d932c765c2b92ed52bbf1a53a2e3be", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85d912282bb657ee657d9c813dfe113e669cdfe66db3621dc6a4c30481f62cb7", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c01684de53b43b7b9c086a302a8c0a104d6321d7abd2c47eaaeaaa61068ce74f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1db078026712a2fa084c2879230ab71555aa77ffdc9105e514caf1c10666408", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea8856b0c7e226633a84d8ff92fc9312cdc56d2c0b15b7eef203b82f553bb217", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58e5e79f7c3fe492ccbfbabb0902e11f58c472b86624edd6eb21717e8ba783bc", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:622d15518b1233e078e3c947199b022e57e306d5a0b094a1c5ebbafa0a449fab", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2502b15abbbb9a0886766e01efefe38d3cddabef4dcbcbf9f016b9cb261bd436", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61ae06135cf3ca9082daf51f49c192c033e91fc6dff17acc7d6f29733cce7c8c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a79a65bbff14fd1abef3db1fccf4e02ee40e8ab8372aec8d0a7ce53057b526", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:056bb55f3e555c7de6aa3525e14bf6b5ca494e1a03dce59e068261968d05a873", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abd5e458eaf4414547aa55747e5c63e30c13137a8db5bb097e577e76b350bd1f", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f010b457345c6683c974fc27df5aac77df2e885761abbaac55466e09e932c6d7" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20f4cced7700c6916990903445d70e7b627cfc55e5e70144855ff03c21515655", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe468ac8fb8a517cbd7451d37cc24b3e97f985d77c79b0e875103480a86c07b0", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae2730e2d231a281c962b75a0e4e110e5558ab4079f2745613b92ad309847824" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 42eb111ffb..c8e2ab4c81 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.15.0-0.nightly-2025-03-06-152934" + "base": "4.15.0-0.nightly-2025-04-02-090624" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b54802955ce7f9c207ef4c918de4b0b11b628a11b1def2a9f7678b0e03bac8c", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ece734dc5cffae61b8b9b997eee87e8970cb9ba53224cc2b79512323c42f664", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40e10ee7c5daf4b7a17930b2f41ef60e28c2b7bcb901d81680108ab90620633d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441c0b0ab8256ed84483b5f793a72fef09db5ace0417410090371c412250a668", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5a66c9f2fb849d906bce776c7ef512936ecb9e4db5547993109f26ac3000dfa", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:991c47ff4f648b41cd27cbd2abcf19725ef0bb2dbb4afc92a84f006099db6241", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06a56b5e7c64cb28ebba25d4e0ed353656dcbd7a00d80df880131f30d2c95fb6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da4f1b989f23bfefa817e77970cf0f900e17b2bac3827cdd74e45b1e493ad456", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca12b2ffddeb26415e76aa80e405e3eacd3f1b8c79f4c9be4a26ad6f867ed7af", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e050375c4988a59033b3fd1ed02595242067b9fbc6dd469f5ecdd16e28ab720e", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5705fee5206c9fd35259b904e3aa850019cf09e81c780f22b543bb2b9ce9837d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9115e7cd698c15ff35a08e9e940a182e07cfffb0ef5b485aa0b4b96f0a6020c4", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:786bd089e8faf171ae9bce483227ddb9ffe35b4ff12c5f9bc4946ef8cc49a354", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53c9bcae6e8cf2c715830f26f5549b8781c68a8f1212bbf6e890573f6262ac14", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1f7a5d5a9d544748aa18b4691491663833ff6557313c9173aba628fd406d492", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0884aea720f8aeafb5a39ad4608993e30b738c9e40fbb1c55b3c621f80703a0e", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a78f04e8d34864802f73ba94f6a40041bf86983f7c0d46d5c64bdac4d06e531d" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b8bd03bee03baadd97bb3a9bfd05b6081e74d0efe549da4838e167301682019", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c1e56d79a8c1249b2eaad27ba5ef6a9deadf7072854ce8b9b24dafabea681f2", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:348edea15b855de71220e3157d1c9bcef25a564fc997cf7d0152048e9a113526" } } From 7645f034db8bd5979fe53d38e54c59ecb2eb54da Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Apr 2025 04:30:12 +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 e74745dedf..efc3d04e91 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=28 KUBE_GIT_VERSION=v1.28.15 -KUBE_GIT_COMMIT=ff493be70058d7324491442be6d57c92cfccb92d +KUBE_GIT_COMMIT=f3836777163e6444ad9116dbcba70a6b8cce9d50 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 88cc8f57da..3d246fdc8b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2025-03-06-143344 +OCP_VERSION := 4.15.0-0.nightly-arm64-2025-04-02-132821 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index f2c5f96ff7..244cbcdd73 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2025-03-06-152934 +OCP_VERSION := 4.15.0-0.nightly-2025-04-02-090624