From 9f5c9bf50618b14b9a9f9e093f2cd568b4739d72 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:16:43 +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 78e5a0a9d7..e84c008407 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.17.0-0.nightly-2025-09-08-175556" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-09-08-185141" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-09-18-053709" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-09-18-071340" From f13d7c0a110b81543c19802c0858015ab628c5d0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:16:44 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 38 +++++++++++++++++++------------ scripts/auto-rebase/commits.txt | 14 ++++++------ 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 75444734eb..55d0df9d56 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,20 +1,28 @@ -- kubernetes embedded-component ce407c5220d03860b36d8640286ae48521a0dc18 to 025ecb69829d3460be23445db21f17dceef31dbd - - 17d4a6bad 2025-08-28T13:35:36+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments +- cluster-network-operator embedded-component 28b6eb3392f935ccc63d77ba307dbda7695b6adf to c766c4635a43a0e8eede94b6782e9b6b35ddcb27 + - d4fd19f 2025-09-03T20:19:37-04:00 Manual feature backport of cert rotation for whereabouts -- machine-config-operator embedded-component b7c4291575a0de49d5951cd72f5425f49738463f to d683459eff679a5d133bdf2d86cf90a3e781a752 - - 94f00780 2025-07-29T14:46:54+00:00 OCPBUGS-57484: Handle migration from OpenShift SDN - - 8a250775 2025-07-29T14:46:54+00:00 OPNET-681: Support migration from configure-ovs to NMState - - c57a4924 2025-05-27T16:54:55+00:00 OCPBUGS-36859: Support NODEIP_HINT in IPI deployments too +- kubernetes embedded-component 025ecb69829d3460be23445db21f17dceef31dbd to c3b3eee783f6d6636cc65d3553b9802f2138e19e + - 8e70b6276 2025-08-26T11:35:33-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 22692b9e8 2025-08-26T09:18:39-04:00 UPSTREAM: 132028: podresources: list: use active pods in list -- operator-framework-olm embedded-component 14f5ca00370ba75eaae689caba5ee86aa411ea74 to 062eb821df5ca4b5d52a0614a46da3c02aaa4dae - - da1a2aff 2025-08-22T01:58:34+00:00 Upstream: : regenerate manifests - - ac1296a7 2025-08-22T01:58:34+00:00 Upstream: 3580: add NetworkPolicy as a supported kind - - f9600cd4 2025-08-22T01:58:34+00:00 Upstream: : Add allow-all networkpolicy for openshift-operators namespace - - b78fe802 2025-08-22T01:58:34+00:00 Upstream: 1675: Add NetworkPolicy as a supported kind +- machine-config-operator embedded-component d683459eff679a5d133bdf2d86cf90a3e781a752 to 3dd385cc383a380e85ed258b738b089981e02df5 + - 3c7c8c00 2025-09-17T13:45:00+00:00 OCPBUGS-61695: Override NMState service definition -- kubernetes image-amd64 ce407c5220d03860b36d8640286ae48521a0dc18 to 025ecb69829d3460be23445db21f17dceef31dbd - - 17d4a6bad 2025-08-28T13:35:36+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments +- openshift-controller-manager embedded-component 47841f6ebaedab0ac83ee904793273377daf0894 to 967faa66125ae77148df87d8394d07112c4c0b8c + - 6513286 2025-09-03T14:02:35+00:00 legacy image pull secret rollback controller + - 9c1da85 2025-09-03T14:02:35+00:00 introduce rollback controllers -- kubernetes image-arm64 ce407c5220d03860b36d8640286ae48521a0dc18 to 025ecb69829d3460be23445db21f17dceef31dbd - - 17d4a6bad 2025-08-28T13:35:36+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments +- operator-framework-olm embedded-component 062eb821df5ca4b5d52a0614a46da3c02aaa4dae to 12fbe1b70635c5c100a6a5fc5734280a17a95c3d + - ca3d423c 2025-09-06T18:04:53+02:00 UPSTREAM: : make downstream csv namespace labeler plugin e2e more resilient to race conditions + - 14004cfb 2025-09-06T18:04:53+02:00 Make PSA catalog tests more resilient (#3645) + - 458af641 2025-09-06T18:04:53+02:00 refactor ensure job to remove named parameters (#3644) + - aeb5d64b 2025-09-06T18:04:53+02:00 Disable FailForward bad resource e2e (#3572) + +- kubernetes image-amd64 025ecb69829d3460be23445db21f17dceef31dbd to c3b3eee783f6d6636cc65d3553b9802f2138e19e + - 8e70b6276 2025-08-26T11:35:33-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 22692b9e8 2025-08-26T09:18:39-04:00 UPSTREAM: 132028: podresources: list: use active pods in list + +- kubernetes image-arm64 025ecb69829d3460be23445db21f17dceef31dbd to c3b3eee783f6d6636cc65d3553b9802f2138e19e + - 8e70b6276 2025-08-26T11:35:33-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 22692b9e8 2025-08-26T09:18:39-04:00 UPSTREAM: 132028: podresources: list: use active pods in list diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 0b816acfd7..e968b53a38 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,16 +5,16 @@ https://github.com/openshift/cluster-ingress-operator embedded-component d95595b https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 51ed2ebfcfd3e177c45d9243b25bdfd36c6a5b1f https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component d68b3764db78ad5ca2e61af75f0bc8bcdcf3e644 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 -https://github.com/openshift/cluster-network-operator embedded-component 28b6eb3392f935ccc63d77ba307dbda7695b6adf +https://github.com/openshift/cluster-network-operator embedded-component c766c4635a43a0e8eede94b6782e9b6b35ddcb27 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component b05a249d6919978217aefa7060951af078eac931 https://github.com/openshift/cluster-policy-controller embedded-component 7209e90d4205dc16bf0c83fb556c3d955d942d6b https://github.com/openshift/csi-external-snapshotter embedded-component 080f6bdb8ffdbfe2556370ce5bc95ac973e1ad95 https://github.com/openshift/etcd embedded-component 0d9e0a907c4aea7c4b2bff627478785fb99511f5 -https://github.com/openshift/kubernetes embedded-component 025ecb69829d3460be23445db21f17dceef31dbd +https://github.com/openshift/kubernetes embedded-component c3b3eee783f6d6636cc65d3553b9802f2138e19e https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 69b07ae04918806079f1a4fbc2f110453bc8db19 -https://github.com/openshift/machine-config-operator embedded-component d683459eff679a5d133bdf2d86cf90a3e781a752 -https://github.com/openshift/openshift-controller-manager embedded-component 47841f6ebaedab0ac83ee904793273377daf0894 -https://github.com/openshift/operator-framework-olm embedded-component 062eb821df5ca4b5d52a0614a46da3c02aaa4dae +https://github.com/openshift/machine-config-operator embedded-component 3dd385cc383a380e85ed258b738b089981e02df5 +https://github.com/openshift/openshift-controller-manager embedded-component 967faa66125ae77148df87d8394d07112c4c0b8c +https://github.com/openshift/operator-framework-olm embedded-component 12fbe1b70635c5c100a6a5fc5734280a17a95c3d https://github.com/openshift/route-controller-manager embedded-component 02bbf80ada3d5acaf36873b1fe69c71badc6d8d7 https://github.com/openshift/service-ca-operator embedded-component 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e https://github.com/openshift/oc image-amd64 fd2be5da398d8287664836e4838b68082a9f1bb8 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 080f6bdb8ffdbf https://github.com/openshift/router image-amd64 1e29d8cc87a1c9e6645a4b9aa01197d90e366152 https://github.com/openshift/kube-rbac-proxy image-amd64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-amd64 82ce0167fce4994b6b9286b509f8cbdd2c65f253 -https://github.com/openshift/kubernetes image-amd64 025ecb69829d3460be23445db21f17dceef31dbd +https://github.com/openshift/kubernetes image-amd64 c3b3eee783f6d6636cc65d3553b9802f2138e19e https://github.com/openshift/service-ca-operator image-amd64 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e https://github.com/openshift/oc image-arm64 fd2be5da398d8287664836e4838b68082a9f1bb8 https://github.com/openshift/coredns image-arm64 dea218b4eeeef8e4ed245389e697c307bcd06552 @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 080f6bdb8ffdbf https://github.com/openshift/router image-arm64 1e29d8cc87a1c9e6645a4b9aa01197d90e366152 https://github.com/openshift/kube-rbac-proxy image-arm64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-arm64 82ce0167fce4994b6b9286b509f8cbdd2c65f253 -https://github.com/openshift/kubernetes image-arm64 025ecb69829d3460be23445db21f17dceef31dbd +https://github.com/openshift/kubernetes image-arm64 c3b3eee783f6d6636cc65d3553b9802f2138e19e https://github.com/openshift/service-ca-operator image-arm64 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e From 211f6a1cfb8d687361fbf657541dafeb53c38131 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:17:23 +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 815e270c58..6f929a4476 100644 --- a/go.mod +++ b/go.mod @@ -219,36 +219,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250829043454-025ecb69829d // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250829043454-025ecb69829d // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250909014134-c3b3eee783f6 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes ) replace ( @@ -259,4 +259,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805164133-69b07ae04918 // 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-20250829043454-025ecb69829d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes diff --git a/go.sum b/go.sum index 3830b7bbd3..0af6d02d56 100644 --- a/go.sum +++ b/go.sum @@ -467,60 +467,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:Cy1JopdDy8ee4sMnik5QlEFMcVFp9iffEc6uInOSMCI= github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= -github.com/openshift/kubernetes v0.0.0-20250829043454-025ecb69829d h1:wuxz65ZyiMts2Qn/SGxuVrE2Yq+Vy3SaKcKr/ZHnduw= -github.com/openshift/kubernetes v0.0.0-20250829043454-025ecb69829d/go.mod h1:jprVlRQRvPfdgqnlJn2KEeQ1yJuA+fYKBtN24qmq/PA= +github.com/openshift/kubernetes v0.0.0-20250909014134-c3b3eee783f6 h1:Zyi/39ki3sheXGwVrA44RXbwSX1VuTyKTejKuMzVFp0= +github.com/openshift/kubernetes v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:jprVlRQRvPfdgqnlJn2KEeQ1yJuA+fYKBtN24qmq/PA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805164133-69b07ae04918 h1:94wzHqWF3RveBeTEaoYBmwLS0iAI7c8hKyNvR8Cjois= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805164133-69b07ae04918/go.mod h1:Uj1Dk7oZKWRMPS8r6M3V7CUGTZxeD+bGTDwxCEGfPnY= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d h1:T3RxoORvfbvEggH5IAvwSpcMxO5XI4jzoJ3G0NSmZkc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d h1:pjYfeWHco9G0PgMg2OzH4OgDx1juFybMZNXhCc4oQ1o= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d/go.mod h1:eqthkjztCiZhYxdLopwo1LpN/O79JC6lYOwCE3/83R0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d h1:GGFIdZc8N4enVGenyh+DTD02HI4TfQZfcmrQuMnWHew= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d h1:H/TobJvHC7PBlucrOp4hflMfyMaDOcNdiHz4gF+xW/M= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d h1:pRRYeKj2SBMuSTBMCzk9/r2zgWZZWU4rp7bSl+4/Hlc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d h1:2cDkNQcabvJNcvyApDaAKr8G69hJolxf1gqZJqKgQSw= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d h1:RxWaOpIt+FN+9DkF1j/s9RweAmWokYcpjiZDwjI4OvI= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d h1:p2WpmQcUjTUCmvBa2+PTrpcbxgAJh9yIA7gr+mQKK50= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d h1:Fhp8+93ooct0/hN3dJQHi4Rtxf0hHhizZvvXWHQthuo= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d h1:bdE9USsVC4mYin7sh364JKBjBID1ki3J0ydXtd08ok8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d/go.mod h1:ufOwMSAMJxeqI2HjhQL9pwg67p9QShqDn5K9/prKq/M= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d h1:/Ds6YOJmjNWQg6rGyHp1SkgQ5eNorJoPnXXfQajgLWg= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d h1:tDEaP3Enrg6WSJOLkDgzTj4ct9jl6vQ8QilrlfyWDsA= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d h1:jq656G910NOZ2AUcKMrZthGGC7H9sto078LhZMlzC3U= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d h1:kH/drYlIQrmuRovK9np5o8EbNhGz4zWLSdRKF+2lK2I= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d h1:wb+U8xBZtdn6wg0ksw7dVv55yE/UtVqdCHl9YlE/UOs= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d h1:S2MdnSjdVFfYec9H3HL3v4Y/sEEjQrObUt9jFDTOXNI= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d h1:MXvdTMd9SWOQAoFkBMXGKvL+hiOFjw6mlIGwK1MBsT4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d/go.mod h1:952JUPqHZQZF/nwPVFdT8F2/WkPZLQ01L42b8eyxF1E= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d h1:gyXWsERSdCDSrG1h/0MbDcFrockTKras4HIt4SgUbQw= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d h1:ly/jLYJXifW1GxgupNSmV30+WttEZBMAiZlGbPOT3AY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d h1:yuqlMn1KAeF1BLEtAJzKIxCWvPd9RszLIx7OBJP2AsU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d h1:/5BIYTHM5hrl3W2ZNpWTqOr84xC9DVEIvEkQrU6bTVM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d h1:Aw8LtHLC3lOvX3C+ygWnPpw0UV+xmAZuqmzrQM2WPjY= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d h1:Xon3/deyUoap8RImrGqivBqzLx37V9QbhHZxQo636WU= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d h1:S1YAWYrSOrwL8M0MG/uKzDkuGt3JafcyauZwbmtKrt0= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d h1:B0jh5dSm5994fW/IXxP2tbQghp276qz7QThqrHnWz00= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 h1:cy3Nd4fL48HKlXCIyzomxlgKop1q9mtp202ne0qci4M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 h1:Hq2ivXKK96ULwGvMIuQQzHclGEjZDGJWrsy7ZrB0h98= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:eqthkjztCiZhYxdLopwo1LpN/O79JC6lYOwCE3/83R0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 h1:pp5JAZnKKtoEmTs1f6WYADXP2gOKirltGF6bXWD0qs8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 h1:POLBDol5/VlR7vHunLXJ+6SuMouO5Pyt5/QYjTc3xjc= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 h1:THGzy5mR6z3mUMBnYw930NiCHn8fILkTaZzmW0F35HM= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 h1:4ZS8eTvjkSjwrSZEqc9U6vGXfLWvKbqFTfxKcpkse5I= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 h1:dpz+vbY44c27h3JFx+E3pzk9O6asiUgUL0Hq/j0GRlU= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 h1:tVA2+s8rD2X2zpsRWvKtUFUuOucbZJXetb5WWyeui2k= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 h1:NupPRUCDzQq4niVX0SxyjkdbtBN+kqpD6hzHP++njSQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 h1:swkgrTcrj0qff6ewUNC7RUBEKqV9MbMmBDXI3Sb4Jjo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:ufOwMSAMJxeqI2HjhQL9pwg67p9QShqDn5K9/prKq/M= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 h1:HQ/QcdiBV0PswgxFPSpKLGupgYYzy7PFlzHWyXj1cg4= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 h1:+kDnKndsbH6jG2a3OuvK3ADzZpaLMSwwtDyKPUnMavg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 h1:lxs21UnxdjJO5BQGcZVRqPNMc3SatkiFxx0YftFQdPo= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 h1:QUm+wjH+2lAQYZXvtaL6NynsGEGKJdml0qnEGVp43m8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 h1:v3g2bIduXgy2Q93AjWUPUM/PffaXsSrIwt+s2ol2Hdo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 h1:WFSlNlU7d7hx0cNwQaCubWgDwNoA8P2VWhbuC9X6IPE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 h1:4Ebnu5osWkkMpurgLDUFA5KdckqOxx0Pf8zDF3oz+mc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:952JUPqHZQZF/nwPVFdT8F2/WkPZLQ01L42b8eyxF1E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 h1:6G3XyE9E9LrqOBcnnGQl5UgeGhkgMY0DN1+KxjrCcKo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 h1:3ceoDxTGPAk7OHHmiamQ3Q2NEJJbXneVRe0W5RjjR5I= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 h1:Sd5Vvt4F6k0lc2yvUpCn6DldY9E31KaB709p5/muqeg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 h1:yyIUT0AUiAPThTCBmGdbJC3OzadQr6HJbDCsAsTmen0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 h1:uBdZ6JNg99caZ2ijfxlEy+myTZlYpq1meUTSsy8r5j0= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 h1:cm3SfFQXejKc8eE5WDhGeYa3cWGaHODYa3FzIG4bZDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 h1:3YIRWoCrfrX8W0vP/lYkElf/1ePvhJ1jo5Hwfn3Uvys= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 h1:sGgRgaoOmR7GQqArPNrzHoyikII0CuOy0ksLh2Zb4Ns= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 721431882beee6cea84f782f5b328edf496a2372 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:11 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../kubelet/apis/podresources/server_v1.go | 13 +- .../pkg/kubelet/apis/podresources/types.go | 1 + .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 18 ++- vendor/modules.txt | 114 +++++++++--------- 4 files changed, 87 insertions(+), 59 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/server_v1.go b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/server_v1.go index fdfd1e6650..d866771b5a 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/server_v1.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/server_v1.go @@ -22,6 +22,7 @@ import ( v1 "k8s.io/api/core/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/klog/v2" kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/kubelet/types" @@ -36,17 +37,21 @@ type v1PodResourcesServer struct { cpusProvider CPUsProvider memoryProvider MemoryProvider dynamicResourcesProvider DynamicResourcesProvider + useActivePods bool } // NewV1PodResourcesServer returns a PodResourcesListerServer which lists pods provided by the PodsProvider // with device information provided by the DevicesProvider func NewV1PodResourcesServer(providers PodResourcesProviders) podresourcesv1.PodResourcesListerServer { + useActivePods := true + klog.InfoS("podresources", "method", "list", "useActivePods", useActivePods) return &v1PodResourcesServer{ podsProvider: providers.Pods, devicesProvider: providers.Devices, cpusProvider: providers.Cpus, memoryProvider: providers.Memory, dynamicResourcesProvider: providers.DynamicResources, + useActivePods: useActivePods, } } @@ -55,7 +60,13 @@ func (p *v1PodResourcesServer) List(ctx context.Context, req *podresourcesv1.Lis metrics.PodResourcesEndpointRequestsTotalCount.WithLabelValues("v1").Inc() metrics.PodResourcesEndpointRequestsListCount.WithLabelValues("v1").Inc() - pods := p.podsProvider.GetPods() + var pods []*v1.Pod + if p.useActivePods { + pods = p.podsProvider.GetActivePods() + } else { + pods = p.podsProvider.GetPods() + } + podResources := make([]*podresourcesv1.PodResources, len(pods)) p.devicesProvider.UpdateAllocatedDevices() diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/types.go index 155d42abbc..9729e21057 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/types.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/podresources/types.go @@ -34,6 +34,7 @@ type DevicesProvider interface { // PodsProvider knows how to provide the pods admitted by the node type PodsProvider interface { + GetActivePods() []*v1.Pod GetPods() []*v1.Pod GetPodByName(namespace, name string) (*v1.Pod, bool) } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index b81358324a..de3add112b 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -2979,6 +2979,22 @@ func (kl *Kubelet) ListenAndServeReadOnly(address net.IP, port uint) { server.ListenAndServeKubeletReadOnlyServer(kl, kl.resourceAnalyzer, address, port) } +type kubeletPodsProvider struct { + kl *Kubelet +} + +func (pp *kubeletPodsProvider) GetActivePods() []*v1.Pod { + return pp.kl.GetActivePods() +} + +func (pp *kubeletPodsProvider) GetPods() []*v1.Pod { + return pp.kl.podManager.GetPods() +} + +func (pp *kubeletPodsProvider) GetPodByName(namespace, name string) (*v1.Pod, bool) { + return pp.kl.podManager.GetPodByName(namespace, name) +} + // ListenAndServePodResources runs the kubelet podresources grpc service func (kl *Kubelet) ListenAndServePodResources() { endpoint, err := util.LocalEndpoint(kl.getPodResourcesDir(), podresources.Socket) @@ -2988,7 +3004,7 @@ func (kl *Kubelet) ListenAndServePodResources() { } providers := podresources.PodResourcesProviders{ - Pods: kl.podManager, + Pods: &kubeletPodsProvider{kl: kl}, Devices: kl.containerManager, Cpus: kl.containerManager, Memory: kl.containerManager, diff --git a/vendor/modules.txt b/vendor/modules.txt index e64a82c2dd..943c7ad89f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1280,7 +1280,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1339,7 +1339,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1386,7 +1386,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1454,7 +1454,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1626,13 +1626,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1979,7 +1979,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2002,14 +2002,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-20250829043454-025ecb69829d +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2043,7 +2043,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2056,7 +2056,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2073,20 +2073,20 @@ 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-20250829043454-025ecb69829d +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured/namedresources/cel -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2111,13 +2111,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2148,7 +2148,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-20250829043454-025ecb69829d +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2181,11 +2181,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2220,7 +2220,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2242,7 +2242,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20250829043454-025ecb69829d +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3054,11 +3054,11 @@ 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-20250829043454-025ecb69829d +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/legacy-cloud-providers/gce k8s.io/legacy-cloud-providers/gce/gcpcredential -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3073,10 +3073,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-20250829043454-025ecb69829d +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3227,38 +3227,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.20240314173009-2cd07f4ca53d -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250829043454-025ecb69829d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250829043454-025ecb69829d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250829043454-025ecb69829d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250909014134-c3b3eee783f6 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805164133-69b07ae04918 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 From 81a7a22e72cbd49e50250cb04ed0283ff7a8b325 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:11 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 60 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 5b22416a86..49722e4457 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,35 +150,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250829043454-025ecb69829d // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250829043454-025ecb69829d // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 8d8d115c3b..0bcdcdd31e 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -200,20 +200,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:uj9xDi github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs= github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:zqzMxqY1vJ2OG1WxTjkoyGD62AHI/JuTxJtEkmkbgDc= github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d h1:T3RxoORvfbvEggH5IAvwSpcMxO5XI4jzoJ3G0NSmZkc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d h1:GGFIdZc8N4enVGenyh+DTD02HI4TfQZfcmrQuMnWHew= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d h1:H/TobJvHC7PBlucrOp4hflMfyMaDOcNdiHz4gF+xW/M= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d h1:pRRYeKj2SBMuSTBMCzk9/r2zgWZZWU4rp7bSl+4/Hlc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d h1:2cDkNQcabvJNcvyApDaAKr8G69hJolxf1gqZJqKgQSw= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d h1:Fhp8+93ooct0/hN3dJQHi4Rtxf0hHhizZvvXWHQthuo= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d h1:yuqlMn1KAeF1BLEtAJzKIxCWvPd9RszLIx7OBJP2AsU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 h1:cy3Nd4fL48HKlXCIyzomxlgKop1q9mtp202ne0qci4M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 h1:pp5JAZnKKtoEmTs1f6WYADXP2gOKirltGF6bXWD0qs8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 h1:POLBDol5/VlR7vHunLXJ+6SuMouO5Pyt5/QYjTc3xjc= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 h1:THGzy5mR6z3mUMBnYw930NiCHn8fILkTaZzmW0F35HM= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 h1:4ZS8eTvjkSjwrSZEqc9U6vGXfLWvKbqFTfxKcpkse5I= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 h1:NupPRUCDzQq4niVX0SxyjkdbtBN+kqpD6hzHP++njSQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 h1:Sd5Vvt4F6k0lc2yvUpCn6DldY9E31KaB709p5/muqeg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 8caaa9c65f50ba17a9c9827da21cd895c5de69ff Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:34 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 1017663679..05f8bcf285 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -677,7 +677,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -733,17 +733,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -892,7 +892,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -929,7 +929,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-20250829043454-025ecb69829d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1056,33 +1056,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250829043454-025ecb69829d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250829043454-025ecb69829d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250829043454-025ecb69829d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250829043454-025ecb69829d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250829043454-025ecb69829d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250829043454-025ecb69829d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250829043454-025ecb69829d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250829043454-025ecb69829d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250829043454-025ecb69829d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250829043454-025ecb69829d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250829043454-025ecb69829d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250829043454-025ecb69829d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250829043454-025ecb69829d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250829043454-025ecb69829d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250829043454-025ecb69829d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250829043454-025ecb69829d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250829043454-025ecb69829d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250829043454-025ecb69829d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250829043454-025ecb69829d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250829043454-025ecb69829d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250829043454-025ecb69829d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250829043454-025ecb69829d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250829043454-025ecb69829d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250909014134-c3b3eee783f6 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250909014134-c3b3eee783f6 From 6a7a963d98a54f5a6a2232b307ee3b2252bac770 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:34 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 9c253ac556..43a6b70976 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a0d70f5e9ea79aed06d924d4e03f8f4efa0ab44bd61b6ebb65505eb7671a6b3" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:580c58d1453b1e0a39c5ccab7bb4e998e4c0f4462b8995f9956db5c49d59b864" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index dbecab1193..5f79959245 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab1f2b5c36fe16087f966d29cda5fcfc4e7c65608d303de7c7a4e700ff5ac9e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eee42ebd3191fd106f83d76236d30fd2cc59e4ee8a9e709f83cef1ab8e671a42" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From e889f9e16dd6c236eece32a2a725d404e5b4bf03 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:38 +0000 Subject: [PATCH 8/9] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../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 | 20 +++++++++---------- assets/release/release-x86_64.json | 20 +++++++++---------- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index b46736cd62..0a171e8115 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:22a9257cc0d403359a6f256a513870926fd475f3efc6abe3e2bf270ec396a5e5 + digest: sha256:c3c88ed2a15a9d941dbdbb58e6436eeba8cf6cec922094c060ac77c60cceca16 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:89397408c213410e44650b8c4a0f4450c2987d979e95d41c4fd9ed77a457e0e4 + digest: sha256:3daf1630ffdb14d63b02991e3698ebb711ea73321f9070241a3a9471bebdf7aa diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 13125bac0a..1b876b016f 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b09bff54edac94efdc72a72b8cc73df47a1e50d3e44f5291a69e2bf998096b16 + digest: sha256:6e2dc8d20c0df30191cbebdd9a01a55b60691b8c23da5c1e3f446a4922eb7f76 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d8c36c8251e73e7997ad34c82be2c05718aa84507d37ca085b4f6d9aea1913ed + digest: sha256:308c52791e8c9033f2b83c0e9bcdef609c1ba7424319694d27e03f5d7f7ecd24 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 440a17908e..79f1abb7bc 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-09-08-185141" + "base": "4.17.0-0.nightly-arm64-2025-09-18-071340" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22a9257cc0d403359a6f256a513870926fd475f3efc6abe3e2bf270ec396a5e5", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89397408c213410e44650b8c4a0f4450c2987d979e95d41c4fd9ed77a457e0e4" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3c88ed2a15a9d941dbdbb58e6436eeba8cf6cec922094c060ac77c60cceca16", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3daf1630ffdb14d63b02991e3698ebb711ea73321f9070241a3a9471bebdf7aa" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 42f62a7009..5b36e22c38 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-2025-09-08-175556" + "base": "4.17.0-0.nightly-2025-09-18-053709" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09bff54edac94efdc72a72b8cc73df47a1e50d3e44f5291a69e2bf998096b16", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8c36c8251e73e7997ad34c82be2c05718aa84507d37ca085b4f6d9aea1913ed" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2dc8d20c0df30191cbebdd9a01a55b60691b8c23da5c1e3f446a4922eb7f76", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:308c52791e8c9033f2b83c0e9bcdef609c1ba7424319694d27e03f5d7f7ecd24" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 2cb4138e23..40cc7e1fda 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:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a + digest: sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c + digest: sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1 + digest: sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a 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:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be - 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:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863 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 be584e2f19..cee30d1f29 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:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821 + digest: sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9 + digest: sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044 + digest: sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c 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:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab - 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:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011 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 e9c4ce7056..1ab3e3aabf 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.17.0-0.nightly-arm64-2025-09-08-185141" + "base": "4.17.0-0.nightly-arm64-2025-09-18-071340" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a" } } 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 6a7c6e9a71..8a00befa44 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.17.0-0.nightly-2025-09-08-175556" + "base": "4.17.0-0.nightly-2025-09-18-053709" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index c89244b831..42e38f9c7b 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-09-08-185141" + "base": "4.17.0-0.nightly-arm64-2025-09-18-071340" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42672193c16bc479aee9880553cf122aa172740c3a8d75ad7dee393a11585fef", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d5e32e724234e63fcd8055ca57a9fe213239a13e0d2934ed6471ae554092e99", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6acc10d16fa1a82454b595327c8d2bd4ffc3c32cdec63ebda490ba0bf674de99", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bcb73ac8ceb1488ef6ec65a00066c08b330d414d71d5c646d2b7cac681d7511", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab1f2b5c36fe16087f966d29cda5fcfc4e7c65608d303de7c7a4e700ff5ac9e", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac31babdf95799058ee03b71c58e52342cf394098558a9e5d952cc30b0efea75", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d781f06832fbcea813526bc2f4c7091c8095c382ac871c023af7ac1fbd87df5a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4838d07264fbbffd6474a05c3eb12fdec20896644a64e3a26ebc7bdce6f44b54", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb7d3b7501494283b341f6aced144c2735c110a26cdcdfc07c30d56fd274f67", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b98be0ad01a37dad548e7090c34d5b7e598241452c06665c1541a5dac922035d", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eee42ebd3191fd106f83d76236d30fd2cc59e4ee8a9e709f83cef1ab8e671a42", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b41dc967009c9f89b7d34e3462490387547f2b1dd5f1be67c6dcea42f0c0982f", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5a464a9755a0948f7e0482d33bbc93ff1dabf6cd5516bbf02bb028cf644ab7a", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d3fbefc4988c82c77f60876ad62faf5f3eb0d1af143e99241437bc255e7e68b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9c42b00def550a9f00e02a5ad86fa79b0433152c096f9c3d88ce394a8d74711", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac401564d4696d37505e33936fa7e62b8c7fb738af786929a646f67d757088dc" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 2d80da8c8b..389bcc3a22 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-2025-09-08-175556" + "base": "4.17.0-0.nightly-2025-09-18-053709" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:972281287e3043374dfed20a2bb3b412c64d66630efe7ccdeb0109bb77198ed4", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13eafa2c2b128e343f529084e7641c133d9ec2606f050ddc44796271205d4be", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:064da555dfaa6a38f7c14aec122b8065b073bfc7eca2b6953c9cad3190555525", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27a7218b7bd9c1f4268d6b06fda11e6e5cfc597bc939232f742622b7a6b54dd8", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a0d70f5e9ea79aed06d924d4e03f8f4efa0ab44bd61b6ebb65505eb7671a6b3", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1cc88fad077fc3bf2dceab9eb2e9dc579c50873b3f455858df04660b2e80814", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f66a014d92c0136a5b492325893c1e35f73694195d607ddc6f713c882b54254", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5174f8dd93e0f979e140f845a9bfefd7a574574aab5607fa8312b324e8297cd", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36e5dc70132a0b35fcc8fda6bdbf5f6729e56b19ba2631cb5c0b1d91c8ab1a40", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01dfde06b01bb2b4dbaf314a0e5d000dfb3369bfef1217f7b2a2f87485ed88c7", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:580c58d1453b1e0a39c5ccab7bb4e998e4c0f4462b8995f9956db5c49d59b864", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:486f9bf79eab3d4ea4c96cd9a7b4a8ad95ff099c4126c45c5222bc7b74f07e4d", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:327619bd642e200d40912078b159128900277c4cacc7a4a4af165d7c095d57f4", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6227d3e832af2bc1d817772f6952028861b7e6793ac3ae576fea536fc837fa4e" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:190871540714a9910ee7ddab4bde437179ac90a38def53aa52d94be809ba0c33", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcd06fe9ff3a398d10d3387e7ad38c7ef288b0224fa1d892d4516eb31a8af389" } } From 4575e6f706ca55dead98b41209f7b2619730d57a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Sep 2025 04:19:44 +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 8d9c3534f1..61acb2b963 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.14 -KUBE_GIT_COMMIT=025ecb69829d3460be23445db21f17dceef31dbd +KUBE_GIT_COMMIT=c3b3eee783f6d6636cc65d3553b9802f2138e19e KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 46052dacdb..8581aacc2c 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2025-09-08-185141 +OCP_VERSION := 4.17.0-0.nightly-arm64-2025-09-18-071340 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 8396789c9f..4dd7784782 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2025-09-08-175556 +OCP_VERSION := 4.17.0-0.nightly-2025-09-18-053709