From bf57c98ac1c9838742fe1d7a3c308bf281bcb4b8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:00:01 +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 ab95d781fa..a2dbf7aedc 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2025-09-02-015633" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-09-02-015632" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2025-09-20-170928" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-09-20-170918" From ccfbadb8430e61ee3e8754bc2690d85f2216e0f8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:00:01 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 63 ++++++++++++++++--------------- scripts/auto-rebase/commits.txt | 12 +++--- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index a66c48fdd3..7356401987 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,32 +1,33 @@ -- cluster-kube-controller-manager-operator embedded-component 0338b3be6912024d03def2c26f0fa10218fc2c25 to b3faac1f48914e94fa9af074f387c871dad84a9c - - 6e19189 2025-08-25T09:35:56+00:00 OCPBUGS-53290: Missing endpoint slices for open ports the operator uses - -- csi-external-snapshotter embedded-component 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- oc image-amd64 ee354f66de43b037ef8b0ed55ce65c6c42aa7b9c to 4c7883ffc539da930d1334421b170322864375d8 - - fd30eacd 2025-08-20T09:14:14+00:00 Use fedora image in unit tests instead of centos - - 6c29db13 2025-07-29T20:30:10+00:00 Adding sos.conf file for default sos config into the tools image - -- csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- oc image-arm64 ee354f66de43b037ef8b0ed55ce65c6c42aa7b9c to 4c7883ffc539da930d1334421b170322864375d8 - - fd30eacd 2025-08-20T09:14:14+00:00 Use fedora image in unit tests instead of centos - - 6c29db13 2025-07-29T20:30:10+00:00 Adding sos.conf file for default sos config into the tools image - -- csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots - -- csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 to ee32ba01e1f89bac057611ad4580589652f250a3 - - 2db434c 2025-08-15T11:55:48+00:00 UPSTREAM: 1238: Snapshot Controller startup should not LIST all volumesnapshots +- cluster-kube-apiserver-operator embedded-component f47238554feb2fa6dbce3333adc7e26ffe2d8424 to 511bc434f628cf364966b53a5d350908e51d4b9c + - eee9449 2025-08-13T14:59:21+00:00 OCPBUGS-50489: Add missing service ports to apiserver service + +- cluster-network-operator embedded-component 45b0ba681e5b2ff88b75c61e17a375fe301b2bb6 to e75d8fa7a0c30a4ad7500b3253f303e051f9ce0b + - acbdfcf 2025-09-04T14:14:04+00:00 HOSTEDCP-1981: Add controlplane cli image envar for use with hypershift + +- kubernetes embedded-component c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d to f3d912311b7c3537def4501ef8e15fda821078e5 + - df551dc6b 2025-09-10T08:15:03-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 63ee8430d 2025-09-09T11:59:40-04:00 UPSTREAM: 132028: podresources: list: use active pods in list + - 757c39582 2025-08-28T14:26:20+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments + +- operator-framework-olm embedded-component 922674d862d36ec848a7cf364d669731edc9c038 to e48ec38c748a5cb90cdaf2fe017fb161301886ae + - 25d15cb6 2025-09-10T09:09:05+02:00 operatorgroup: ensure clusterroleselectors in clusterrole aggregation rules are sorted (#3593) + - 4c172ef7 2025-09-06T18:05:40+02:00 UPSTREAM: : make downstream csv namespace labeler plugin e2e more resilient to race conditions + - 0c09d1e6 2025-09-06T18:05:35+02:00 Make PSA catalog tests more resilient (#3645) + - dfdcdc3c 2025-09-06T18:05:30+02:00 refactor ensure job to remove named parameters (#3644) + - d1cf1763 2025-09-06T18:05:25+02:00 Disable FailForward bad resource e2e (#3572) + - 5fa22132 2025-08-20T14:18:34-04:00 Upstream: : regenerate manifests + - 532583c0 2025-08-20T13:22:01-04:00 Upstream: : Add allow-all networkpolicy for openshift-operators namespace + - 1b90107a 2025-08-20T13:21:53-04:00 Upstream: 3580: add NetworkPolicy as a supported kind + - 85058364 2025-08-20T13:21:44-04:00 Upstream: 1675: Add NetworkPolicy as a supported kind + - c2fb6b2b 2025-07-22T15:42:53-04:00 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597) + +- kubernetes image-amd64 c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d to f3d912311b7c3537def4501ef8e15fda821078e5 + - df551dc6b 2025-09-10T08:15:03-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 63ee8430d 2025-09-09T11:59:40-04:00 UPSTREAM: 132028: podresources: list: use active pods in list + - 757c39582 2025-08-28T14:26:20+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments + +- kubernetes image-arm64 c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d to f3d912311b7c3537def4501ef8e15fda821078e5 + - df551dc6b 2025-09-10T08:15:03-04:00 UPSTREAM: : remove the backward compat featuregate for 132028 + - 63ee8430d 2025-09-09T11:59:40-04:00 UPSTREAM: 132028: podresources: list: use active pods in list + - 757c39582 2025-08-28T14:26:20+02:00 UPSTREAM: 127757: scheduler: Improve CSILimits plugin accuracy by using VolumeAttachments diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 486add75d4..d09bc1aa1f 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,19 +1,19 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 439826e1a723c094717877db0f2ca1848d0fb10a https://github.com/openshift/cluster-dns-operator embedded-component a4b1cfb4927052f4e21e919d0af05f78ca4fcace https://github.com/openshift/cluster-ingress-operator embedded-component 218159f7b060760c7e910b57429beea2f3eb3146 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f47238554feb2fa6dbce3333adc7e26ffe2d8424 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 511bc434f628cf364966b53a5d350908e51d4b9c https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b3faac1f48914e94fa9af074f387c871dad84a9c https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6 -https://github.com/openshift/cluster-network-operator embedded-component 45b0ba681e5b2ff88b75c61e17a375fe301b2bb6 +https://github.com/openshift/cluster-network-operator embedded-component e75d8fa7a0c30a4ad7500b3253f303e051f9ce0b https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2ed3cf9965f8e6832cffde84f3de2fe210b79b49 https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88 https://github.com/openshift/csi-external-snapshotter embedded-component ee32ba01e1f89bac057611ad4580589652f250a3 https://github.com/openshift/etcd embedded-component e7911c0d19925c0a67328052a8580a80fb40cb5b -https://github.com/openshift/kubernetes embedded-component c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d +https://github.com/openshift/kubernetes embedded-component f3d912311b7c3537def4501ef8e15fda821078e5 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 6f2133209d90d822e79d679ed483eeb755ceaaf8 https://github.com/openshift/machine-config-operator embedded-component cbd3b1f2d4ff551425658cca30ecf8cfc5fe3277 https://github.com/openshift/openshift-controller-manager embedded-component 326317ac51b73267300ff3262887dd5326ada0ac -https://github.com/openshift/operator-framework-olm embedded-component 922674d862d36ec848a7cf364d669731edc9c038 +https://github.com/openshift/operator-framework-olm embedded-component e48ec38c748a5cb90cdaf2fe017fb161301886ae https://github.com/openshift/route-controller-manager embedded-component 5da234dd58c092cba019807979f9c29664ddb860 https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-amd64 4c7883ffc539da930d1334421b170322864375d8 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 ee32ba01e1f89b https://github.com/openshift/router image-amd64 7c4b47201b75421631739feb42e7ae86ae047739 https://github.com/openshift/kube-rbac-proxy image-amd64 c38f4734c6b6931c75d46674122fb4b838b6e64b https://github.com/openshift/ovn-kubernetes image-amd64 4ddb31314bc3e6372317e4b8f16982d9594e197f -https://github.com/openshift/kubernetes image-amd64 c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d +https://github.com/openshift/kubernetes image-amd64 f3d912311b7c3537def4501ef8e15fda821078e5 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-arm64 4c7883ffc539da930d1334421b170322864375d8 https://github.com/openshift/coredns image-arm64 1e417656c1c72d3410b31ee08caf25bcdf8836e3 @@ -34,5 +34,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 ee32ba01e1f89b https://github.com/openshift/router image-arm64 7c4b47201b75421631739feb42e7ae86ae047739 https://github.com/openshift/kube-rbac-proxy image-arm64 c38f4734c6b6931c75d46674122fb4b838b6e64b https://github.com/openshift/ovn-kubernetes image-arm64 4ddb31314bc3e6372317e4b8f16982d9594e197f -https://github.com/openshift/kubernetes image-arm64 c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d +https://github.com/openshift/kubernetes image-arm64 f3d912311b7c3537def4501ef8e15fda821078e5 https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac From 3cb3928d27cb2210ad07a435be9c1aec9a72fa34 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:00:39 +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 60893e2cc5..133b875afe 100644 --- a/go.mod +++ b/go.mod @@ -233,36 +233,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250808221949-c68a6637efae // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250808221949-c68a6637efae // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250911183532-f3d912311b7c // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250911183532-f3d912311b7c // from kubernetes ) replace ( @@ -273,4 +273,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250806094225-6f2133209d90 // 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-20250808221949-c68a6637efae // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c // staging kubernetes diff --git a/go.sum b/go.sum index 1a23b7fb87..12cf725f98 100644 --- a/go.sum +++ b/go.sum @@ -502,60 +502,60 @@ github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992 h1:fh7P github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes v0.0.0-20250808221949-c68a6637efae h1:UcdIaYSijXUjdJRTst8zM3ASV1KOTMJ3lcwgt1ZS2HQ= -github.com/openshift/kubernetes v0.0.0-20250808221949-c68a6637efae/go.mod h1:qfHpJmKw/Xj8ANJOegNbbwD2lh5+1nN9e4uXkA5fGTI= +github.com/openshift/kubernetes v0.0.0-20250911183532-f3d912311b7c h1:28lqVjSdbA3U6siw47OCiUSmWclBGF19eYDxWhSAV7U= +github.com/openshift/kubernetes v0.0.0-20250911183532-f3d912311b7c/go.mod h1:qfHpJmKw/Xj8ANJOegNbbwD2lh5+1nN9e4uXkA5fGTI= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250806094225-6f2133209d90 h1:kWQJ1SWldHnkdC3LSU8bhZzP9pahi96h7IEaTBwllpI= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250806094225-6f2133209d90/go.mod h1:XvsDWvUXlITs6q4deif+DIbomfUhxf6igCMjFiP6jHU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae h1:rw8H/3jFZsI7fkn7faAPlj1uk4gBwiSANmdE7/EwAhM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae/go.mod h1:qMfTVH/yQM4Gc2f5VQJbV1AMWQi8YFwu6fKRuT1Csx4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae h1:ZI8M4498onk64q4PBPlZWS1wvC/76Yat7RSUjTRp5xg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae/go.mod h1:jhDtaY6FHLbdNB1nonFhYsFlUvaJdPGPVx36znayM9I= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae h1:stOVWOwGgzvFr1DJp3qUnonkwr67hANTSEbDTC1Ql/E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae h1:Nkxgs9tBVAtU0IKCEIivjIR445rvRnKN0CakDKhQ4hY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae/go.mod h1:4wOG/HF+iyD0gEisqn5Ep09bAqOHw8Vl0mkB9ZEbF2A= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae h1:MF0bKyH/aVwVuac1OZrcuaYYCtZ2ytPLlaKax63qUdQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae h1:n7hg/mCkmwzpKgFRtE8eQePkBX15foHA5YKLFvPmgow= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae h1:OcBBH7KmocDF+ztukFKDwxu4aVyn+cAyBhY0omH+0G8= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae h1:E2iak98SzBWZzzXJFPtRWa0ji4Tf0BqmBqp27ET2uoM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae h1:0s47q6FvnCaRryHXqHAyJKOd3ZIj1ZF2kDXj6pd/e2o= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae/go.mod h1:3b4Iqz886KuvrA4U8pXcWoOPZh+fHh04LF28btXScbw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae h1:xNC+Tj+S/u/0PgeCl/NiXsHJLRFRfml26eayJnwmZn4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae/go.mod h1:Ogwj8/aLf37gUsRvZD1mAbSYWGxDAvc5RlO1c0PtjJY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae h1:HL1LCWZ1TDthnRup6taAjwnGUboE7hN7lffLlCo1HFw= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae h1:+tXsjWTks+U1RGeDLxu2EbFsu4icOYdOMnS50ArFtF8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae h1:KXHigt+FA7THdsT86Fg7rZRVnFpExggiK24y4z137ZE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae h1:xbR8qOA4mYODHF71oDVUTJQZ+QSCnsU/T/HQqOUu2fc= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae h1:dsEZRryOr/JRX8/9h58A6NsxgvsK3D1eXINNj6JHffg= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae h1:u38OnMLzq9y9u6blJMm4/1WLbpeSd09LeCB2EVZi7k8= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae h1:SBYkiGevI9uC3xLKCSQp4kHLD1O7QcN8DXKs9gqVEkk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae/go.mod h1:qU9xk9626BLArUnM067MnuYDKCp5yy1PZypQg5VFN1U= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae h1:kpG6/j24egWurmxoNXL5oQN5n0xrL0SzMPlKdVxMhUs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae h1:FqCdEPNg3K6MiWhyRyHdpSEJCDyFhCUKHxTx1I9RmzY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae h1:fucFo6g2HUwtaVmaemuSrRMxfbIV6uoyaR6A4ZtISZs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae h1:N3xSYuEBwWLeYT/lB8ExOOBWE82CuPA+bQw9GZFBykY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae h1:0r1IiS+gr00o9L30T/NzYaA9x3ramTtgfZv/vqbho3E= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae h1:gJsVC6xLHIimP6aI7wEhP8bKAH4cpMYc7n42RrpOPmI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae h1:Q8WXAprNZ4sBSyPVXfxZUTQ+8wmo1nQvWHpLb9MTJ6A= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae h1:7M0OoRTTSDVKBy2sn/t2LQDT1AsPLU7Ewe2Nlcv1cqo= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c h1:u2P+ayAc7PS4HLLAKKtq6QL09imbpb1yWpQOH2q/wSc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c/go.mod h1:qMfTVH/yQM4Gc2f5VQJbV1AMWQi8YFwu6fKRuT1Csx4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c h1:vQ0Mkxrb8sEUEXahaSR1JAb4yHLGl7AdsZLWSJ4FIVE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c/go.mod h1:jhDtaY6FHLbdNB1nonFhYsFlUvaJdPGPVx36znayM9I= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c h1:CQ+YFugQ5TEaMfiOwizS31ylrGqqsgKp4LY3+RZ9JbU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c h1:C+likrEhvRtF1oobPUqo9XXVhruZVKFRG6rxkZuGbUM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c/go.mod h1:4wOG/HF+iyD0gEisqn5Ep09bAqOHw8Vl0mkB9ZEbF2A= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c h1:7zCx6el41PCmu5Z9pGpqv0zROyX/zkyvcN3WCqXeX44= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c h1:vIEr3uSMDv4wAvbO3uJFeTW6VYvYazFxraE2yEF7OJw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c h1:7R9AjWdqkzp6vCLFUkN5YL4v1yj7jwYQEcauIhU/QI0= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c h1:v8bQz0w+DCalQIgrlgWlkPdm0FMW8AwtBfbtyjVWxoM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c h1:42RknoTysWJm/RmDS55vqNNSXdxhgcMwfq7f9p9UGh0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c/go.mod h1:3b4Iqz886KuvrA4U8pXcWoOPZh+fHh04LF28btXScbw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c h1:bXB8C0Vd3m+cLkUWpcBEQCDULT7d4c8zcFI9TNAN2AM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c/go.mod h1:Ogwj8/aLf37gUsRvZD1mAbSYWGxDAvc5RlO1c0PtjJY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c h1:4/IbowYftEqgY4s08Yf9l6N2quyLVAgV5ojdG5VZOUU= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c h1:LgbAcx2QTWU8gFjuXJW2hvoBjpGnac8+NFvU31ArzGc= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c h1:OhNuRUIUlU9gyRQxSNvUBOeokzveN9d7D+sW1z44uHM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c h1:XN5SXd2xlBziHRcmPz03XnF/TYs45MyiCXy2fj2ReLY= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c h1:eOVkpsHQJk45rMPvMyVoUUuYjOBuLrbEmDemwJyP6s0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c h1:ezBpyeupgnj4pdhqIK5SWkIyHbgXr4SfOq6gqI2hTtc= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c h1:pDFCz0UWFCHLSuQ4uQWR7otPLTNb1kcEYOdLBYprcuI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c/go.mod h1:qU9xk9626BLArUnM067MnuYDKCp5yy1PZypQg5VFN1U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c h1:M4iCmpzMQXTtrTr6I4xF2xa/JgIiF4rY8O5tHFFYSrw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c h1:ZKeN/BLfhsLHQB/I3EDFfN3ds9ACUqWeDwIf716A43U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c h1:WYVu1L0YpCDPbZDyO1h9QmZVs20jiMQw/VssSF/4QLA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c h1:dKNqfPehgCGWauY0pE1gx7osMR2eptXHsSX5N/rjC+8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c h1:6WcBJoQKhEgUEt1pAAbyTjLoX1w0LUPSC9IIqdTGOTo= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c h1:z+f8eWhOlTdLN4hzD7hmD+ZJc5jPktGubSHky1Ui3yQ= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c h1:Ut/MvEdr1US+zGhdhcRnIhHDzaoqTCFYisDUAckGVzE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c h1:XNC5pMCMxbSoQ5q9Swr86zhjavbOLNAJMSWt2IgR9vs= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/openshift/route-controller-manager v0.0.0-20250521141417-5da234dd58c0 h1:YBzKz2yobpIRlo3w4X5FdRrPy+0APXJgxpSeYjaWva4= From 6a22742494400d001a5af1e849262d1940a79a1a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:00:57 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../kubernetes/pkg/features/kube_features.go | 9 -- .../kubelet/apis/podresources/server_v1.go | 44 ++++--- .../pkg/kubelet/apis/podresources/types.go | 1 + .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 18 ++- .../framework/plugins/nodevolumelimits/csi.go | 60 ++++++++- .../authorizer/rbac/bootstrappolicy/policy.go | 1 + vendor/modules.txt | 114 +++++++++--------- 7 files changed, 162 insertions(+), 85 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index 43cae7a4b8..fbbe984415 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -452,13 +452,6 @@ const ( // Enable POD resources API with Get method KubeletPodResourcesGet featuregate.Feature = "KubeletPodResourcesGet" - // owner: @ffromani - // alpha: v1.21 - // beta: v1.23 - // GA: v1.28 - // Enable POD resources API to return allocatable resources - KubeletPodResourcesGetAllocatable featuregate.Feature = "KubeletPodResourcesGetAllocatable" - // KubeletSeparateDiskGC enables Kubelet to garbage collection images/containers on different filesystems // owner: @kannon92 // kep: https://kep.k8s.io/4191 @@ -1102,8 +1095,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS KubeletPodResourcesGet: {Default: false, PreRelease: featuregate.Alpha}, - KubeletPodResourcesGetAllocatable: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.28, remove in 1.30 - KubeletSeparateDiskGC: {Default: false, PreRelease: featuregate.Alpha}, KubeletTracing: {Default: true, PreRelease: featuregate.Beta}, 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 58ba9dbba9..c261be727a 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 @@ -20,11 +20,13 @@ import ( "context" "fmt" + 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/kubelet/pkg/apis/podresources/v1" + podresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1" ) // v1PodResourcesServer implements PodResourcesListerServer @@ -34,38 +36,48 @@ 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) v1.PodResourcesListerServer { +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, } } // List returns information about the resources assigned to pods on the node -func (p *v1PodResourcesServer) List(ctx context.Context, req *v1.ListPodResourcesRequest) (*v1.ListPodResourcesResponse, error) { +func (p *v1PodResourcesServer) List(ctx context.Context, req *podresourcesv1.ListPodResourcesRequest) (*podresourcesv1.ListPodResourcesResponse, error) { metrics.PodResourcesEndpointRequestsTotalCount.WithLabelValues("v1").Inc() metrics.PodResourcesEndpointRequestsListCount.WithLabelValues("v1").Inc() - pods := p.podsProvider.GetPods() - podResources := make([]*v1.PodResources, len(pods)) + 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() for i, pod := range pods { - pRes := v1.PodResources{ + pRes := podresourcesv1.PodResources{ Name: pod.Name, Namespace: pod.Namespace, - Containers: make([]*v1.ContainerResources, len(pod.Spec.Containers)), + Containers: make([]*podresourcesv1.ContainerResources, len(pod.Spec.Containers)), } for j, container := range pod.Spec.Containers { - pRes.Containers[j] = &v1.ContainerResources{ + pRes.Containers[j] = &podresourcesv1.ContainerResources{ Name: container.Name, Devices: p.devicesProvider.GetDevices(string(pod.UID), container.Name), CpuIds: p.cpusProvider.GetCPUs(string(pod.UID), container.Name), @@ -79,18 +91,18 @@ func (p *v1PodResourcesServer) List(ctx context.Context, req *v1.ListPodResource podResources[i] = &pRes } - response := &v1.ListPodResourcesResponse{ + response := &podresourcesv1.ListPodResourcesResponse{ PodResources: podResources, } return response, nil } // GetAllocatableResources returns information about all the resources known by the server - this more like the capacity, not like the current amount of free resources. -func (p *v1PodResourcesServer) GetAllocatableResources(ctx context.Context, req *v1.AllocatableResourcesRequest) (*v1.AllocatableResourcesResponse, error) { +func (p *v1PodResourcesServer) GetAllocatableResources(ctx context.Context, req *podresourcesv1.AllocatableResourcesRequest) (*podresourcesv1.AllocatableResourcesResponse, error) { metrics.PodResourcesEndpointRequestsTotalCount.WithLabelValues("v1").Inc() metrics.PodResourcesEndpointRequestsGetAllocatableCount.WithLabelValues("v1").Inc() - response := &v1.AllocatableResourcesResponse{ + response := &podresourcesv1.AllocatableResourcesResponse{ Devices: p.devicesProvider.GetAllocatableDevices(), CpuIds: p.cpusProvider.GetAllocatableCPUs(), Memory: p.memoryProvider.GetAllocatableMemory(), @@ -100,7 +112,7 @@ func (p *v1PodResourcesServer) GetAllocatableResources(ctx context.Context, req } // Get returns information about the resources assigned to a specific pod -func (p *v1PodResourcesServer) Get(ctx context.Context, req *v1.GetPodResourcesRequest) (*v1.GetPodResourcesResponse, error) { +func (p *v1PodResourcesServer) Get(ctx context.Context, req *podresourcesv1.GetPodResourcesRequest) (*podresourcesv1.GetPodResourcesResponse, error) { metrics.PodResourcesEndpointRequestsTotalCount.WithLabelValues("v1").Inc() metrics.PodResourcesEndpointRequestsGetCount.WithLabelValues("v1").Inc() @@ -115,14 +127,14 @@ func (p *v1PodResourcesServer) Get(ctx context.Context, req *v1.GetPodResourcesR return nil, fmt.Errorf("pod %s in namespace %s not found", req.PodName, req.PodNamespace) } - podResources := &v1.PodResources{ + podResources := &podresourcesv1.PodResources{ Name: pod.Name, Namespace: pod.Namespace, - Containers: make([]*v1.ContainerResources, len(pod.Spec.Containers)), + Containers: make([]*podresourcesv1.ContainerResources, len(pod.Spec.Containers)), } for i, container := range pod.Spec.Containers { - podResources.Containers[i] = &v1.ContainerResources{ + podResources.Containers[i] = &podresourcesv1.ContainerResources{ Name: container.Name, Devices: p.devicesProvider.GetDevices(string(pod.UID), container.Name), CpuIds: p.cpusProvider.GetCPUs(string(pod.UID), container.Name), @@ -133,7 +145,7 @@ func (p *v1PodResourcesServer) Get(ctx context.Context, req *v1.GetPodResourcesR } } - response := &v1.GetPodResourcesResponse{ + response := &podresourcesv1.GetPodResourcesResponse{ PodResources: podResources, } return response, nil 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 b19c87103c..c1191f1777 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -2968,6 +2968,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) @@ -2977,7 +2993,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/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go index 5db408b33c..b69a1110e1 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go @@ -22,6 +22,7 @@ import ( v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/rand" corelisters "k8s.io/client-go/listers/core/v1" @@ -54,6 +55,7 @@ type CSILimits struct { pvLister corelisters.PersistentVolumeLister pvcLister corelisters.PersistentVolumeClaimLister scLister storagelisters.StorageClassLister + vaLister storagelisters.VolumeAttachmentLister randomVolumeIDPrefix string @@ -119,6 +121,7 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v logger.V(5).Info("Could not get a CSINode object for the node", "node", klog.KObj(node), "err", err) } + // Count CSI volumes from the new pod newVolumes := make(map[string]string) if err := pl.filterAttachableVolumes(logger, pod, csiNode, true /* new pod */, newVolumes); err != nil { return framework.AsStatus(err) @@ -135,6 +138,7 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v return nil } + // Count CSI volumes from existing pods attachedVolumes := make(map[string]string) for _, existingPod := range nodeInfo.Pods { if err := pl.filterAttachableVolumes(logger, existingPod.Pod, csiNode, false /* existing pod */, attachedVolumes); err != nil { @@ -149,6 +153,19 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v attachedVolumeCount[volumeLimitKey]++ } + // Count CSI volumes from VolumeAttachments + volumeAttachments, err := pl.getNodeVolumeAttachmentInfo(logger, node.Name) + if err != nil { + return framework.AsStatus(err) + } + + for volumeUniqueName, driverName := range volumeAttachments { + // Avoid double-counting volumes already used by existing pods + if _, exists := attachedVolumes[volumeUniqueName]; !exists { + attachedVolumeCount[driverName]++ + } + } + newVolumeCount := map[string]int{} for _, volumeLimitKey := range newVolumes { newVolumeCount[volumeLimitKey]++ @@ -231,7 +248,7 @@ func (pl *CSILimits) filterAttachableVolumes( continue } - volumeUniqueName := fmt.Sprintf("%s/%s", driverName, volumeHandle) + volumeUniqueName := getVolumeUniqueName(driverName, volumeHandle) volumeLimitKey := volumeutil.GetCSIAttachLimitKey(driverName) result[volumeUniqueName] = volumeLimitKey } @@ -273,7 +290,7 @@ func (pl *CSILimits) checkAttachableInlineVolume(logger klog.Logger, vol *v1.Vol if translatedPV.Spec.PersistentVolumeSource.CSI == nil { return nil } - volumeUniqueName := fmt.Sprintf("%s/%s", driverName, translatedPV.Spec.PersistentVolumeSource.CSI.VolumeHandle) + volumeUniqueName := getVolumeUniqueName(driverName, translatedPV.Spec.PersistentVolumeSource.CSI.VolumeHandle) volumeLimitKey := volumeutil.GetCSIAttachLimitKey(driverName) result[volumeUniqueName] = volumeLimitKey return nil @@ -383,6 +400,7 @@ func NewCSI(_ context.Context, _ runtime.Object, handle framework.Handle, fts fe pvcLister := informerFactory.Core().V1().PersistentVolumeClaims().Lister() csiNodesLister := informerFactory.Storage().V1().CSINodes().Lister() scLister := informerFactory.Storage().V1().StorageClasses().Lister() + vaLister := informerFactory.Storage().V1().VolumeAttachments().Lister() csiTranslator := csitrans.New() return &CSILimits{ @@ -390,6 +408,7 @@ func NewCSI(_ context.Context, _ runtime.Object, handle framework.Handle, fts fe pvLister: pvLister, pvcLister: pvcLister, scLister: scLister, + vaLister: vaLister, randomVolumeIDPrefix: rand.String(32), translator: csiTranslator, }, nil @@ -410,3 +429,40 @@ func getVolumeLimits(nodeInfo *framework.NodeInfo, csiNode *storagev1.CSINode) m } return nodeVolumeLimits } + +// getNodeVolumeAttachmentInfo returns a map of volumeID to driver name for the given node. +func (pl *CSILimits) getNodeVolumeAttachmentInfo(logger klog.Logger, nodeName string) (map[string]string, error) { + volumeAttachments := make(map[string]string) + vas, err := pl.vaLister.List(labels.Everything()) + if err != nil { + return nil, err + } + for _, va := range vas { + if va.Spec.NodeName == nodeName { + if va.Spec.Attacher == "" { + logger.V(5).Info("VolumeAttachment has no attacher", "VolumeAttachment", klog.KObj(va)) + continue + } + if va.Spec.Source.PersistentVolumeName == nil { + logger.V(5).Info("VolumeAttachment has no PV name", "VolumeAttachment", klog.KObj(va)) + continue + } + pv, err := pl.pvLister.Get(*va.Spec.Source.PersistentVolumeName) + if err != nil { + logger.V(5).Info("Unable to get PV for VolumeAttachment", "VolumeAttachment", klog.KObj(va), "err", err) + continue + } + if pv.Spec.CSI == nil { + logger.V(5).Info("PV is not a CSI volume", "PV", klog.KObj(pv)) + continue + } + volumeID := getVolumeUniqueName(va.Spec.Attacher, pv.Spec.CSI.VolumeHandle) + volumeAttachments[volumeID] = volumeutil.GetCSIAttachLimitKey(va.Spec.Attacher) + } + } + return volumeAttachments, nil +} + +func getVolumeUniqueName(driverName, volumeHandle string) string { + return fmt.Sprintf("%s/%s", driverName, volumeHandle) +} diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go index 71ed4cb83b..3e9b2956be 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go @@ -573,6 +573,7 @@ func clusterRoles() []rbacv1.ClusterRole { rbacv1helpers.NewRule("create").Groups(authorizationGroup).Resources("subjectaccessreviews").RuleOrDie(), // Needed for volume limits rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csinodes").RuleOrDie(), + rbacv1helpers.NewRule("get", "list", "watch").Groups(storageGroup).Resources("volumeattachments").RuleOrDie(), // Needed for namespaceSelector feature in pod affinity rbacv1helpers.NewRule(Read...).Groups(legacyGroup).Resources("namespaces").RuleOrDie(), rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csidrivers").RuleOrDie(), diff --git a/vendor/modules.txt b/vendor/modules.txt index 749d978cc8..e185f88ef2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1361,7 +1361,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae +# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1465,7 +1465,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1532,7 +1532,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1700,13 +1700,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2044,7 +2044,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae +# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2067,14 +2067,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2108,7 +2108,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae +# k8s.io/component-helpers v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2121,7 +2121,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae +# k8s.io/controller-manager v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2138,19 +2138,19 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2174,13 +2174,13 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae +# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae +# k8s.io/kube-aggregator v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2211,7 +2211,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 @@ -2244,11 +2244,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2283,7 +2283,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae +# k8s.io/kubelet v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2305,7 +2305,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.29.1 => github.com/openshift/kubernetes v0.0.0-20250808221949-c68a6637efae +# k8s.io/kubernetes v1.29.1 => github.com/openshift/kubernetes v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3105,7 +3105,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3147,7 +3147,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3162,10 +3162,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae +# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3316,38 +3316,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250808221949-c68a6637efae -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250808221949-c68a6637efae -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250808221949-c68a6637efae +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250911183532-f3d912311b7c +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250911183532-f3d912311b7c +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250911183532-f3d912311b7c # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241220152452-e7911c0d1992 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250806094225-6f2133209d90 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c From 48b516ef6e4feed73615cb7c0dc7bcae52159883 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:00:57 +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 84ac90465f..c624407cbd 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -151,35 +151,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250808221949-c68a6637efae // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250808221949-c68a6637efae // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250911183532-f3d912311b7c // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250911183532-f3d912311b7c // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index af08e8d68e..7e69a5c1ee 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -206,20 +206,20 @@ github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 h1:2+vn github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae h1:rw8H/3jFZsI7fkn7faAPlj1uk4gBwiSANmdE7/EwAhM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae/go.mod h1:qMfTVH/yQM4Gc2f5VQJbV1AMWQi8YFwu6fKRuT1Csx4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae h1:stOVWOwGgzvFr1DJp3qUnonkwr67hANTSEbDTC1Ql/E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae h1:Nkxgs9tBVAtU0IKCEIivjIR445rvRnKN0CakDKhQ4hY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae/go.mod h1:4wOG/HF+iyD0gEisqn5Ep09bAqOHw8Vl0mkB9ZEbF2A= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae h1:MF0bKyH/aVwVuac1OZrcuaYYCtZ2ytPLlaKax63qUdQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae h1:n7hg/mCkmwzpKgFRtE8eQePkBX15foHA5YKLFvPmgow= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae h1:0s47q6FvnCaRryHXqHAyJKOd3ZIj1ZF2kDXj6pd/e2o= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae/go.mod h1:3b4Iqz886KuvrA4U8pXcWoOPZh+fHh04LF28btXScbw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae h1:fucFo6g2HUwtaVmaemuSrRMxfbIV6uoyaR6A4ZtISZs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c h1:u2P+ayAc7PS4HLLAKKtq6QL09imbpb1yWpQOH2q/wSc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c/go.mod h1:qMfTVH/yQM4Gc2f5VQJbV1AMWQi8YFwu6fKRuT1Csx4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c h1:CQ+YFugQ5TEaMfiOwizS31ylrGqqsgKp4LY3+RZ9JbU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c h1:C+likrEhvRtF1oobPUqo9XXVhruZVKFRG6rxkZuGbUM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c/go.mod h1:4wOG/HF+iyD0gEisqn5Ep09bAqOHw8Vl0mkB9ZEbF2A= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c h1:7zCx6el41PCmu5Z9pGpqv0zROyX/zkyvcN3WCqXeX44= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c h1:vIEr3uSMDv4wAvbO3uJFeTW6VYvYazFxraE2yEF7OJw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c h1:42RknoTysWJm/RmDS55vqNNSXdxhgcMwfq7f9p9UGh0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c/go.mod h1:3b4Iqz886KuvrA4U8pXcWoOPZh+fHh04LF28btXScbw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c h1:WYVu1L0YpCDPbZDyO1h9QmZVs20jiMQw/VssSF/4QLA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= From 31b2879ffd8a8a798a06591e66e8ecf10a90c69b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:01:03 +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 bfbab63289..5c2eaea3ad 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -675,7 +675,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -729,17 +729,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -886,7 +886,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -921,7 +921,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c ## explicit; go 1.21 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1049,33 +1049,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241220152452-e7911c0d1992 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241220152452-e7911c0d1992 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250808221949-c68a6637efae -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250808221949-c68a6637efae -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250808221949-c68a6637efae -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250808221949-c68a6637efae -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250808221949-c68a6637efae -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250808221949-c68a6637efae -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250808221949-c68a6637efae -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250808221949-c68a6637efae -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250808221949-c68a6637efae -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250808221949-c68a6637efae -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250808221949-c68a6637efae -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250808221949-c68a6637efae -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250808221949-c68a6637efae -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250808221949-c68a6637efae -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250808221949-c68a6637efae -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250808221949-c68a6637efae -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250808221949-c68a6637efae -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250808221949-c68a6637efae -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250808221949-c68a6637efae -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250808221949-c68a6637efae -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250808221949-c68a6637efae -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250808221949-c68a6637efae -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250808221949-c68a6637efae +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250911183532-f3d912311b7c +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250911183532-f3d912311b7c +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250911183532-f3d912311b7c +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250911183532-f3d912311b7c +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250911183532-f3d912311b7c +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250911183532-f3d912311b7c +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250911183532-f3d912311b7c +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250911183532-f3d912311b7c +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250911183532-f3d912311b7c +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250911183532-f3d912311b7c +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250911183532-f3d912311b7c +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250911183532-f3d912311b7c +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250911183532-f3d912311b7c +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250911183532-f3d912311b7c +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250911183532-f3d912311b7c +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250911183532-f3d912311b7c +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250911183532-f3d912311b7c From f074e09a3f55d40b648518b888a9cd3bc4f0bb27 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:01:03 +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 c0b64fc013..bda9cc2ee8 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:32117a2b8fd111988b1b11d175d2c2c242f3abc66a33f0ac7dd3c22487404a57" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25ac73379d2213abe9c7c4bfd5056b4c5ae468da8d72c08020c08e490b562c91" 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 c5f28b5b77..a66a2b7d92 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:3d45ed1cb96fca62f24a498ceb565f6e8370a7669b572350bb517d63e65f2b93" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdc982b184d6f95c26adb17b05a037a5e6c45df3d4cbd56d4a1a9ec7e3f2f130" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 864d74cd9dceed64041652ea12b7cca62cf4c39c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:01:05 +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 ++++----- .../kustomization.yaml | 1 + .../release-olm-aarch64.json | 8 +++---- .../release-olm-x86_64.json | 8 +++---- assets/release/release-aarch64.json | 22 +++++++++---------- assets/release/release-x86_64.json | 22 +++++++++---------- 11 files changed, 51 insertions(+), 50 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index d7003541f0..2bb7476ccb 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:546263c7efb5cbaea346fe92dc2399b605aa2f32651eb857d6a0c17bd713b9ef + digest: sha256:4f8955111fa8dc4180ad8e116689cacd8fe9029ecb49557673c65281b052a276 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:78bc364116fd6f897f3f0f5ed1c35e7f82397c4aec02f0e2aeb38a07ce78ac2d + digest: sha256:b30a4f76b2d904229f1ee60bd3432ee3ea68ac4a6a29aacbf6cb06f5b6f52bbc diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index d43f325859..78dfc1008a 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:debff5847176bb3f889c07131b5452bf4d41d4e050c83355735a37fb737de8f1 + digest: sha256:1264524972074f208ba7f682ec7613eb3eca9692c694b0ff1809c6353140ef6a - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:aeff56607a25976c759ca7ad8cdf3ed56e303b87bfd7df3c8f1f1e1e5eba2d3f + digest: sha256:33f0410dab7b6b5230dcad0e10a3df1b441780c1dba1a1a6413fa7514e108aba diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index dc1c870d5f..56b88aedec 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-09-02-015632" + "base": "4.16.0-0.nightly-arm64-2025-09-20-170918" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:546263c7efb5cbaea346fe92dc2399b605aa2f32651eb857d6a0c17bd713b9ef", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78bc364116fd6f897f3f0f5ed1c35e7f82397c4aec02f0e2aeb38a07ce78ac2d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f8955111fa8dc4180ad8e116689cacd8fe9029ecb49557673c65281b052a276", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b30a4f76b2d904229f1ee60bd3432ee3ea68ac4a6a29aacbf6cb06f5b6f52bbc" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 3889887932..935c38dd8f 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.16.0-0.nightly-2025-09-02-015633" + "base": "4.16.0-0.nightly-2025-09-20-170928" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:debff5847176bb3f889c07131b5452bf4d41d4e050c83355735a37fb737de8f1", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aeff56607a25976c759ca7ad8cdf3ed56e303b87bfd7df3c8f1f1e1e5eba2d3f" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1264524972074f208ba7f682ec7613eb3eca9692c694b0ff1809c6353140ef6a", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33f0410dab7b6b5230dcad0e10a3df1b441780c1dba1a1a6413fa7514e108aba" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index b541c8f199..ce6ab7f6d4 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:f429b7f7f61291d3bdd2f451b4a46cb1b30ff6bea0b1be62805cb8b0be24fddc + digest: sha256:5add3bcf009b5a1f83e99469e083f85861445ec9d56526c7aa652d190f686da8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5ead9517953ce770b075be8bcc34dc046753b1a5dbd1a68083c2c6b1ec91bae5 + digest: sha256:d9183496b78b113edfe272f4e8419d2cdbbf31ee64b59da28b1315655402a9d0 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:214daa798f4278db5c10c4697b4194b356b0bca1c6fe4bcd17601c1b56d56ced + digest: sha256:e001528a13d1a515430da9cea0f6cddb7ce4fdf4c2557e57192f9cd236a12586 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:5ead9517953ce770b075be8bcc34dc046753b1a5dbd1a68083c2c6b1ec91bae5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9183496b78b113edfe272f4e8419d2cdbbf31ee64b59da28b1315655402a9d0 - 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:f429b7f7f61291d3bdd2f451b4a46cb1b30ff6bea0b1be62805cb8b0be24fddc + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5add3bcf009b5a1f83e99469e083f85861445ec9d56526c7aa652d190f686da8 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 4a1417fd6d..2e7e3c6e0d 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:4702ff24e95cf3c7da6520f9d9969a3ae7cb8ca5b334ea5ac0165ea288eb0b35 + digest: sha256:11e1923b14901433046b1b4dd4556760096738a933c2b6e98bb2320966b00476 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:171079848ff0cd983684c3887ec5c1c7cfbe9095a136e6ea016c7f636a590134 + digest: sha256:f1cb5e2b7e34f0dc5be5623121563705e070df586b7edb0321570d8b2fa2f2ba - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e19c579fb957823026ad4af2b67aa8e0c9639dfd26280089436a6bd13a6cb702 + digest: sha256:fd94f1706d31a24f5a2a3ff1d7fba13a3273ecb059179031c3333095ebaa09e2 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:171079848ff0cd983684c3887ec5c1c7cfbe9095a136e6ea016c7f636a590134 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cb5e2b7e34f0dc5be5623121563705e070df586b7edb0321570d8b2fa2f2ba - 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:4702ff24e95cf3c7da6520f9d9969a3ae7cb8ca5b334ea5ac0165ea288eb0b35 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11e1923b14901433046b1b4dd4556760096738a933c2b6e98bb2320966b00476 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.yaml b/assets/optional/operator-lifecycle-manager/kustomization.yaml index ea1c55c54e..2147cc0b9c 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.yaml @@ -14,6 +14,7 @@ resources: - 0000_50_olm_00-pprof-rbac.yaml - 0000_50_olm_00-pprof-secret.yaml - 0000_50_olm_00-subscriptions.crd.yaml + - 0000_50_olm_01-networkpolicies.yaml - 0000_50_olm_01-olm-operator.serviceaccount.yaml - 0000_50_olm_02-olmconfig.yaml - 0000_50_olm_02-services.yaml diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 267819845f..dac49c497c 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-09-02-015632" + "base": "4.16.0-0.nightly-arm64-2025-09-20-170918" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f429b7f7f61291d3bdd2f451b4a46cb1b30ff6bea0b1be62805cb8b0be24fddc", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ead9517953ce770b075be8bcc34dc046753b1a5dbd1a68083c2c6b1ec91bae5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:214daa798f4278db5c10c4697b4194b356b0bca1c6fe4bcd17601c1b56d56ced" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5add3bcf009b5a1f83e99469e083f85861445ec9d56526c7aa652d190f686da8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9183496b78b113edfe272f4e8419d2cdbbf31ee64b59da28b1315655402a9d0", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e001528a13d1a515430da9cea0f6cddb7ce4fdf4c2557e57192f9cd236a12586" } } 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 5a667bf178..3f152a27c2 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-2025-09-02-015633" + "base": "4.16.0-0.nightly-2025-09-20-170928" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4702ff24e95cf3c7da6520f9d9969a3ae7cb8ca5b334ea5ac0165ea288eb0b35", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:171079848ff0cd983684c3887ec5c1c7cfbe9095a136e6ea016c7f636a590134", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e19c579fb957823026ad4af2b67aa8e0c9639dfd26280089436a6bd13a6cb702" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11e1923b14901433046b1b4dd4556760096738a933c2b6e98bb2320966b00476", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cb5e2b7e34f0dc5be5623121563705e070df586b7edb0321570d8b2fa2f2ba", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd94f1706d31a24f5a2a3ff1d7fba13a3273ecb059179031c3333095ebaa09e2" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1409af0ec8..4be6c6d8f7 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-09-02-015632" + "base": "4.16.0-0.nightly-arm64-2025-09-20-170918" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce9ba6119be0b734b1f06ef76920a91ec60bf02db5426bd84b46108880af04e3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:482fa1a1189f9a69ceede392d30b37df6f490312133b07fb160a941288bef9d3", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ccae3f40c64be32b7a773fdaa430f6c7d0ed7778418a55c3cd1517886f9e759", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:214daa798f4278db5c10c4697b4194b356b0bca1c6fe4bcd17601c1b56d56ced", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f24f90d2624bf70c4b4ddd95d0d9581eb0dc9b230520e0020e2f4d40e81a0529", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c629b487b0c7e51dda587d06d15078f82aa22216fb60fa8afdc3b38aac20f80", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9355d28a4f11fd8d4a4e0c27824ed6566e45a6b7fc7733f1bbf6bd42b26b8cf9", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e001528a13d1a515430da9cea0f6cddb7ce4fdf4c2557e57192f9cd236a12586", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7d1fccbb21e299db680024a21d16bd5e6c3b664bb77faad2c60502e264c86d2", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d45ed1cb96fca62f24a498ceb565f6e8370a7669b572350bb517d63e65f2b93", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd96705c67bb13404cb5f3ae03ebf9e29b4b00d9264b9b007c8823096d406840", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d298cff0c2e9ec4e3e26010374c639ef1f30f0d4d9f9b17f1ffe22c4a14f7289", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdc982b184d6f95c26adb17b05a037a5e6c45df3d4cbd56d4a1a9ec7e3f2f130", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d660456491fd866cd643963a4de0d614a379c3cd8c24dce016184f8d6b289c70", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fd8fec8cd97b6099be8b511f8c03bbb6d4b5537d185b092c945277a865204a0", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5d0418e7661bdba8c8bccffdf081e2bc630767e6b8ae1ac099f1c0d6ddd7b74", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c41abf20797e0e0a74aeb25f510689cb5f1fdaaab90a1507163a4d201d4b7c0d" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9938c605619461a8b0905dceea8ef4b6b3e84537478d00b1c74c98fc57a625b", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:268bfebce38bc648dc15abda67b104375ea6f13172e353c4bdfa5c100ccf766f", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d4adb7aa957de6928a4c89fddc3d3c70712fb60afda2a9d7fc7808ae80feb60" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7a71845e71..5034453409 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-2025-09-02-015633" + "base": "4.16.0-0.nightly-2025-09-20-170928" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524a2bb37891467c9cb43ab3c5b13d3b1a4ee0ce42ed78ce77dbcdf6284977fc", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5818766b4a9f63b6767801173813bc1995f7b405967619c08ba45ea856de495a", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0d53bfa8474636abcc9f8a0cefb13069a77e00296c404be39e057dbbdbcabc1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e19c579fb957823026ad4af2b67aa8e0c9639dfd26280089436a6bd13a6cb702", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:781bff98ef2a590e69b386e4da4346ab4cb1ccaabd782e7718dc74adc6190686", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bbaf3683c7dd3716ba6f7f122be6eff2d1e1fc5116e927f5bb491a3a9d09ddd", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d2c7aa20a1da1d3eaa85fd89be3c5a828e9bce8a784cde4755ded3b1ff84cb4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd94f1706d31a24f5a2a3ff1d7fba13a3273ecb059179031c3333095ebaa09e2", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:723d06b34af7f631f8404b53d469e4b921ea8cf8793383f718013c89ca5cc3ec", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32117a2b8fd111988b1b11d175d2c2c242f3abc66a33f0ac7dd3c22487404a57", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57b7346210cc85f7dd4f188292fd0b0129ec7d60d2447f6125aa8043b6418658", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d346b51a71e41eaf98be8ac4e74d3d3a630e895aec16bbeceb34fef3834affa3", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25ac73379d2213abe9c7c4bfd5056b4c5ae468da8d72c08020c08e490b562c91", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f848dc2d4f2a264362ec6cebd2e51936ce11410692688d214ca42b0b743dbe3", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b81ccf95b3f4c7fa69ac15ec1ada3d22cebeaa53aa0ee2bbe77863ba323fcbaa", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14a051ae85b29aa82fa4f448d3169fd5fd37fb37d7cf7b24af3e76b224ae2a25", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d79fd44973f45b77370287936c5319fee81f4f9831fa0f300d2a58fb084c420" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef37a7692de6676726ecb723b9902e87095b696103b4a161142a66e088d1ba78", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28826159dd552a70eeb584088ff432b764b70261aa0cc6eb95dbebfca9b60ea3", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758c258fe5b9f7e8725619a63bf8fd5590371c76b259cc7cbe195a0d82eaa46b" } } From c946637778c3abf77db603ec4136cdde4a6f62ce Mon Sep 17 00:00:00 2001 From: ci-robot Date: Sun, 21 Sep 2025 16:01:08 +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 06220a0694..97127abe02 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=29 KUBE_GIT_VERSION=v1.29.14 -KUBE_GIT_COMMIT=c68a6637efaef7f3bb6f3cf4d6f2ac223c12703d +KUBE_GIT_COMMIT=f3d912311b7c3537def4501ef8e15fda821078e5 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index f2795d195e..a3482616dc 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2025-09-02-015632 +OCP_VERSION := 4.16.0-0.nightly-arm64-2025-09-20-170918 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 09cd709972..a6ba9c84cd 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2025-09-02-015633 +OCP_VERSION := 4.16.0-0.nightly-2025-09-20-170928