From 43fbdf9ea81a64eadbaa1682c1ff247e15394f85 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:23:57 +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 1a7a216935..d89e71e893 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-07-07-070757" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-07-07-171451" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-07-16-160419" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-07-16-182416" From 8e098192a8f0916707de863a7df626d5d3284e4e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:23:57 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 65 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 12 +++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..3ffe18b20e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,65 @@ +- kubernetes embedded-component a5f4f8936f3df828973cf00299f26bb441a9244b to ce407c5220d03860b36d8640286ae48521a0dc18 + - efbad1199 2025-07-08T04:23:22+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 9e1848391 2025-06-17T18:29:19+00:00 Release commit for Kubernetes v1.30.14 + - af29100d1 2025-06-11T08:27:36+02:00 Bump images, dependencies and versions to go 1.23.10 and distroless iptables + - 81d95c641 2025-05-23T09:24:19-04:00 Bump images, dependencies and versions to go 1.23.9 and distroless iptables + - 7160194a5 2025-05-16T11:33:57+02:00 kubelet: Wrap user namespace manager errors + - b8aa6d752 2025-05-16T11:33:57+02:00 kubelet: Add logs for userns custom mappings parsing + - d222ec142 2025-05-16T11:31:24+02:00 userns: Wrap more errors + - 80aa6d0b1 2025-05-16T11:31:24+02:00 userns: Improve error returned if userns is not supported + - ef132adf0 2025-05-16T11:31:24+02:00 userns: Use len to handle empty non-nil slices + - b8ce9a3d5 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Wrap error to get mappings + - 9efcbf99c 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Provide stub implementation for windows + - f491b54bc 2025-05-16T11:21:54+02:00 pkg/kubelet: Fix userns tests on Windows + - 4c2a2348b 2025-05-15T10:16:53+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.13 + - 50af91c46 2025-05-15T09:47:44+00:00 Release commit for Kubernetes v1.30.13 + - 7b92f1f7c 2025-05-09T00:46:51+02:00 Bump images, dependencies and versions + - 24abad1fe 2025-04-22T16:27:33+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.12 + +- machine-config-operator embedded-component 62605c08b2c0f49496ee22e10611299fee6996f4 to 6728dcc85e006d75d39d653d42daac2c91af8127 + - 754658aa 2025-07-02T02:27:16+00:00 Do not set cpu system reserve below the default value + - eedad170 2025-06-24T19:05:40+00:00 daemon: update desired config version in MCN spec on OCL update + - 7632b8d6 2025-05-22T18:37:44+00:00 OCPBUGS-55681: Give keepalived container chroot cap + +- openshift-controller-manager embedded-component a1438e643feb6dc992e2c723618b5f4e81bb31c7 to 47841f6ebaedab0ac83ee904793273377daf0894 + - c2b412f 2025-06-23T12:38:52+00:00 OCPBUGS-57918: handle secret not found more gracefully + +- operator-framework-olm embedded-component cd52f1260803e03c8dd8e48aa801492baff09893 to 9fbe7d715495e7ac15081a475faa3b8bf526f799 + - 8004b747 2025-06-13T07:26:59+00:00 operatorgroup: ensure clusterroleselectors in clusterrole aggregation rules are sorted (#3593) + +- kubernetes image-amd64 a5f4f8936f3df828973cf00299f26bb441a9244b to ce407c5220d03860b36d8640286ae48521a0dc18 + - efbad1199 2025-07-08T04:23:22+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 9e1848391 2025-06-17T18:29:19+00:00 Release commit for Kubernetes v1.30.14 + - af29100d1 2025-06-11T08:27:36+02:00 Bump images, dependencies and versions to go 1.23.10 and distroless iptables + - 81d95c641 2025-05-23T09:24:19-04:00 Bump images, dependencies and versions to go 1.23.9 and distroless iptables + - 7160194a5 2025-05-16T11:33:57+02:00 kubelet: Wrap user namespace manager errors + - b8aa6d752 2025-05-16T11:33:57+02:00 kubelet: Add logs for userns custom mappings parsing + - d222ec142 2025-05-16T11:31:24+02:00 userns: Wrap more errors + - 80aa6d0b1 2025-05-16T11:31:24+02:00 userns: Improve error returned if userns is not supported + - ef132adf0 2025-05-16T11:31:24+02:00 userns: Use len to handle empty non-nil slices + - b8ce9a3d5 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Wrap error to get mappings + - 9efcbf99c 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Provide stub implementation for windows + - f491b54bc 2025-05-16T11:21:54+02:00 pkg/kubelet: Fix userns tests on Windows + - 4c2a2348b 2025-05-15T10:16:53+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.13 + - 50af91c46 2025-05-15T09:47:44+00:00 Release commit for Kubernetes v1.30.13 + - 7b92f1f7c 2025-05-09T00:46:51+02:00 Bump images, dependencies and versions + - 24abad1fe 2025-04-22T16:27:33+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.12 + +- kubernetes image-arm64 a5f4f8936f3df828973cf00299f26bb441a9244b to ce407c5220d03860b36d8640286ae48521a0dc18 + - efbad1199 2025-07-08T04:23:22+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 9e1848391 2025-06-17T18:29:19+00:00 Release commit for Kubernetes v1.30.14 + - af29100d1 2025-06-11T08:27:36+02:00 Bump images, dependencies and versions to go 1.23.10 and distroless iptables + - 81d95c641 2025-05-23T09:24:19-04:00 Bump images, dependencies and versions to go 1.23.9 and distroless iptables + - 7160194a5 2025-05-16T11:33:57+02:00 kubelet: Wrap user namespace manager errors + - b8aa6d752 2025-05-16T11:33:57+02:00 kubelet: Add logs for userns custom mappings parsing + - d222ec142 2025-05-16T11:31:24+02:00 userns: Wrap more errors + - 80aa6d0b1 2025-05-16T11:31:24+02:00 userns: Improve error returned if userns is not supported + - ef132adf0 2025-05-16T11:31:24+02:00 userns: Use len to handle empty non-nil slices + - b8ce9a3d5 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Wrap error to get mappings + - 9efcbf99c 2025-05-16T11:21:54+02:00 pkg/kubelet/userns: Provide stub implementation for windows + - f491b54bc 2025-05-16T11:21:54+02:00 pkg/kubelet: Fix userns tests on Windows + - 4c2a2348b 2025-05-15T10:16:53+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.13 + - 50af91c46 2025-05-15T09:47:44+00:00 Release commit for Kubernetes v1.30.13 + - 7b92f1f7c 2025-05-09T00:46:51+02:00 Bump images, dependencies and versions + - 24abad1fe 2025-04-22T16:27:33+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.12 + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 305e3df87a..c3cf4d7231 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -10,11 +10,11 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 7209e90d4205dc16bf0c83fb556c3d955d942d6b https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/etcd embedded-component 0d9e0a907c4aea7c4b2bff627478785fb99511f5 -https://github.com/openshift/kubernetes embedded-component a5f4f8936f3df828973cf00299f26bb441a9244b +https://github.com/openshift/kubernetes embedded-component ce407c5220d03860b36d8640286ae48521a0dc18 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0b41e7bf19a6bffa060eb26ecd4830634882d4a3 -https://github.com/openshift/machine-config-operator embedded-component 62605c08b2c0f49496ee22e10611299fee6996f4 -https://github.com/openshift/openshift-controller-manager embedded-component a1438e643feb6dc992e2c723618b5f4e81bb31c7 -https://github.com/openshift/operator-framework-olm embedded-component cd52f1260803e03c8dd8e48aa801492baff09893 +https://github.com/openshift/machine-config-operator embedded-component 6728dcc85e006d75d39d653d42daac2c91af8127 +https://github.com/openshift/openshift-controller-manager embedded-component 47841f6ebaedab0ac83ee904793273377daf0894 +https://github.com/openshift/operator-framework-olm embedded-component 9fbe7d715495e7ac15081a475faa3b8bf526f799 https://github.com/openshift/route-controller-manager embedded-component 02bbf80ada3d5acaf36873b1fe69c71badc6d8d7 https://github.com/openshift/service-ca-operator embedded-component 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e https://github.com/openshift/oc image-amd64 f39295cb74b7d3d5571f38b88f55475fe13bf007 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc5523 https://github.com/openshift/router image-amd64 1e29d8cc87a1c9e6645a4b9aa01197d90e366152 https://github.com/openshift/kube-rbac-proxy image-amd64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-amd64 3b4486bca363f366b28953f1bb5c1e64d84ceca4 -https://github.com/openshift/kubernetes image-amd64 a5f4f8936f3df828973cf00299f26bb441a9244b +https://github.com/openshift/kubernetes image-amd64 ce407c5220d03860b36d8640286ae48521a0dc18 https://github.com/openshift/service-ca-operator image-amd64 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e https://github.com/openshift/oc image-arm64 f39295cb74b7d3d5571f38b88f55475fe13bf007 https://github.com/openshift/coredns image-arm64 dea218b4eeeef8e4ed245389e697c307bcd06552 @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc5523 https://github.com/openshift/router image-arm64 1e29d8cc87a1c9e6645a4b9aa01197d90e366152 https://github.com/openshift/kube-rbac-proxy image-arm64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-arm64 3b4486bca363f366b28953f1bb5c1e64d84ceca4 -https://github.com/openshift/kubernetes image-arm64 a5f4f8936f3df828973cf00299f26bb441a9244b +https://github.com/openshift/kubernetes image-arm64 ce407c5220d03860b36d8640286ae48521a0dc18 https://github.com/openshift/service-ca-operator image-arm64 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e From 55d1d7f43a7b11959418ebd7c905ef9faca74db9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:24:51 +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 9f1cd97af5..dedf3aaa12 100644 --- a/go.mod +++ b/go.mod @@ -219,36 +219,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250624145242-a5f4f8936f3d // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250708171801-ce407c5220d0 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250708171801-ce407c5220d0 // from kubernetes ) replace ( @@ -259,4 +259,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250611153038-0b41e7bf19a6 // 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-20250624145242-a5f4f8936f3d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes diff --git a/go.sum b/go.sum index 6e2522ac12..310b333528 100644 --- a/go.sum +++ b/go.sum @@ -467,60 +467,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:Cy1JopdDy8ee4sMnik5QlEFMcVFp9iffEc6uInOSMCI= github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= -github.com/openshift/kubernetes v0.0.0-20250624145242-a5f4f8936f3d h1:E9alAa9N8TVMw+SPOE2bjVv3gEOvcheTe8J5Q8zm2zs= -github.com/openshift/kubernetes v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:jprVlRQRvPfdgqnlJn2KEeQ1yJuA+fYKBtN24qmq/PA= +github.com/openshift/kubernetes v0.0.0-20250708171801-ce407c5220d0 h1:hK59bmS2VRDa5TpAxGjuUyLOBAwmMN+5MJwOQnJvrm4= +github.com/openshift/kubernetes v0.0.0-20250708171801-ce407c5220d0/go.mod h1:jprVlRQRvPfdgqnlJn2KEeQ1yJuA+fYKBtN24qmq/PA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250611153038-0b41e7bf19a6 h1:lSmKp1YanIiSk+aEleMlTLE+XCZBZKqvoL6pTUc0Ggo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250611153038-0b41e7bf19a6/go.mod h1:Uj1Dk7oZKWRMPS8r6M3V7CUGTZxeD+bGTDwxCEGfPnY= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d h1:HeB2bGaKXHRP/Iq1AVWyjaMgh56s4fS685rahQhkU30= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d h1:PWkAy3mP+wLEbYvjdRAeaVeH0vcKnAvQEB36nOQPXrY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:eqthkjztCiZhYxdLopwo1LpN/O79JC6lYOwCE3/83R0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d h1:0K03Cm7N8qwVsWGXCjuxwds9ySVO+O83Stph1yGYcso= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d h1:ZlZ3BabWc79TL7Wy6/ZL+N8CIidjffw08V229apbXeo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d h1:7CxV8QZJEv35nUxhfUhI/wTE+8zoGiy7qFgy5+CjS2k= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d h1:gf+wsYXWmq6z0DBZs1TMXQ58jYnw472l+f/WbUNEDIo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d h1:wHDXJO3TpqnmkgktQsZbFkMY3v354sdbsATT825p5ok= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d h1:N3LymikHjQgzl663s214P249BlO0rsTgeSojJxy6/9o= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d h1:dh8FTApwdIhVE9hcpVLacvmBdXJMz0uqQdo+LYZwih4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d h1:MbUKRQngMRbZ74SRtgeH+upXna4SZ14o10jjQFdtEps= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:ufOwMSAMJxeqI2HjhQL9pwg67p9QShqDn5K9/prKq/M= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d h1:aoq6PoRRuDfALbfMdAxht56tDJ6IOwdgkUyWFnbTNE4= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d h1:fwR+eGjq6cFvYrpgllN1d4roHYUlyVzjUXyHEsoFHFI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d h1:55/YCcpLMAlLkUI6StUJXKG0LfmN4+OVCAWZhC8TxTU= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d h1:dCQK+Ht7KMtq2KfbDY8UTAeCdfiMmsMTCBnUAhHXefc= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d h1:EuAxOATjZgoj5SBcVejs3RbkNhq/GhQG1U/lWUCka8g= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d h1:Uh0MlJBRWUWNYKxRfYOSYg0Yi2TY++lX2Cr7RmgS+KQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d h1:eGjpx29TWa8m8YHOyELNhHVdRtiJCnZ05FqAVflNoH0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:952JUPqHZQZF/nwPVFdT8F2/WkPZLQ01L42b8eyxF1E= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d h1:zMscsfphKc+vDJ2dwHhmF9OgcY2yJjNmBColwLoV/Oc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d h1:0P9yAPzW7p53Wn3DX0rmE+O0RD42t+XHwdIKATkE7xI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d h1:JP5rmdpzXncByR5j7pozlEbN+dcrycLqfZfgKK2PFxI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d h1:xNT6ubwW1QsHEyGAQq/ncTvcuVnVMo2P6SvjuspxjNU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d h1:y8Zl3ft2+7DoDJd5ipy4e4wjmKXXaINWAjqzAG9KakY= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d h1:AdsjEXYqj4lrt5ORW7GAPI3jf0HzdMLunp3PqAM3HLc= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d h1:yrgD1NU03AHJ/LN1Bk7ImSt76fb1tBP3mIYzmygUL2Q= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d h1:ygnA2repwPBqtYSw/CLm0vFOwG77ZsofBYklBbq36iE= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 h1:5Z/T4tzSVHpRdIjJsVWhJBSVrJzqOdZGX2yQx74X7qw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 h1:s1Zh4KwQsu5MEhXV/lyYD7vhcO6ucu/Qs54NTKQ4w1I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0/go.mod h1:eqthkjztCiZhYxdLopwo1LpN/O79JC6lYOwCE3/83R0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 h1:0zoINIuGB0vI4p/ScLDkyxxcecJ/Y146nKyKe4F8yXU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 h1:RV8U/FkulV7PhfiErika33ICcxwWU8Gn6I/pkQnfX6I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 h1:prxKZWfVskq194odmdXsbctTkTE1EiXnXMxRIVGDimQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 h1:jbhv0VMVvA0j8fFrIeJwvLINjSSSx7XMUAa32YODHbU= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 h1:zMY6vvNckLny27Y8i5h/vKqVDJRgDbJJQjBDA2DwAT0= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 h1:KMpyBQBd1QPylssONFBsfg0d5BNZ3nxpZH1+CwcCk7A= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 h1:f81XR5nDzo49AO3exxrA6qdVJoGtovTxhJ5KcdP5W3A= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 h1:uym3h2KSehm0Y2MD5VgMqK228VQluuwYUj/sb1ZNo8M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0/go.mod h1:ufOwMSAMJxeqI2HjhQL9pwg67p9QShqDn5K9/prKq/M= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 h1:lKRH444GYe2YnC2gOAC5RcymIZxXG3Nr3o5xaTlFC7o= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 h1:jxrFpzXBiUqvkG6rFQw8bYo2GBfUY3gAI4tLamv1Qxo= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 h1:7wYbvWezZF6xm/mt67KvI93OqIpT/XAGbMcW7IjNclA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 h1:hZsUTB4wJdVHDlZ9FrlghUYqek403ZZ0KSY2qS/H/k8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 h1:tgQy0cl6QZ7Qb1h3+SBHIYwbTNQN6/zDgQI19bqG4l0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 h1:1C5KYcN2APkl2cB1KZT+8ggp4V+0WwEIhAlRf9IEmlE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 h1:UBpBZVHn0i88ucEdchnUltxbap5Ce/miIJAZRcQPdQY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0/go.mod h1:952JUPqHZQZF/nwPVFdT8F2/WkPZLQ01L42b8eyxF1E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 h1:rjLN4aalSaDbUWTiY0jKra+O69kgBCM1OspCi/SpeGQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 h1:01Dxe4i8Owe6oYXk99ohtqxv4ZkyzF9Cj1uGl67dgJY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 h1:DWjyJJRnHMQP6vWg8saMutgLGA8LNWoTFx2ZVMYhFVM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 h1:Fg8m7CJ0wRbKVYSKGZEH31izzdVlN3oczjVOhIBSabA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 h1:cvMZiIGPDaYH/MuoDkRuheRKdKIncQMoArqnZb9z5pY= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 h1:UXFqFS9Pb8J9BvzqwBhDUd/jh07mfrv+HswVDttIlyM= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 h1:k+oFRny996sLlh+IXKl2h3HrupR4NXaUC0oW0gqS4+g= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 h1:lnesb3lKGTCHRcGqvb5ZRKAWjKIAsqa6emAhNZ4Q1xw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From c28481545c4c0fd95372a0f916efd8de5c22fa21 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:10 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 2 +- .../kubernetes/pkg/kubelet/kubelet_getters.go | 5 +- .../kubernetes/pkg/kubelet/kubelet_pods.go | 11 +- .../kubernetes/pkg/kubelet/userns/types.go | 29 +++++ .../pkg/kubelet/userns/userns_manager.go | 32 ++--- .../kubelet/userns/userns_manager_windows.go | 50 ++++++++ vendor/modules.txt | 114 +++++++++--------- 7 files changed, 165 insertions(+), 78 deletions(-) create mode 100644 vendor/k8s.io/kubernetes/pkg/kubelet/userns/types.go create mode 100644 vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager_windows.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index 17112da695..b81358324a 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -941,7 +941,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, klet.shutdownManager = shutdownManager klet.usernsManager, err = userns.MakeUserNsManager(klet) if err != nil { - return nil, err + return nil, fmt.Errorf("create user namespace manager: %w", err) } klet.admitHandlers.AddPodAdmitHandler(shutdownAdmitHandler) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_getters.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_getters.go index a32f197143..918ce9006d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_getters.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_getters.go @@ -120,8 +120,9 @@ func (kl *Kubelet) ListPodsFromDisk() ([]types.UID, error) { // user namespaces. func (kl *Kubelet) HandlerSupportsUserNamespaces(rtHandler string) (bool, error) { rtHandlers := kl.runtimeState.runtimeHandlers() - if rtHandlers == nil { - return false, fmt.Errorf("runtime handlers are not set") + if len(rtHandlers) == 0 { + // The slice is empty if the runtime is old and doesn't support this message. + return false, nil } for _, h := range rtHandlers { if h.Name == rtHandler { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go index b93c8a3bd1..f1bef9abc7 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go @@ -132,11 +132,17 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { return defaultFirstID, defaultLen, nil } + // Windows doesn't support user namespaces, let's return the default mappings. + if runtime.GOOS == "windows" { + return defaultFirstID, defaultLen, nil + } + _, err := user.Lookup(kubeletUser) if err != nil { var unknownUserErr user.UnknownUserError if goerrors.As(err, &unknownUserErr) { // if the user is not found, we assume that the user is not configured + klog.V(5).InfoS("user namespaces: user not found, using default mappings", "user", kubeletUser) return defaultFirstID, defaultLen, nil } return 0, 0, err @@ -146,14 +152,14 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { cmd, err := exec.LookPath(execName) if err != nil { if os.IsNotExist(err) { - klog.V(2).InfoS("Could not find executable, default mappings will be used for the user namespaces", "executable", execName, "err", err) + klog.V(2).InfoS("user namespaces: executable not found, using default mappings", "executable", execName, "err", err) return defaultFirstID, defaultLen, nil } return 0, 0, err } outUids, err := exec.Command(cmd, kubeletUser).Output() if err != nil { - return 0, 0, fmt.Errorf("error retrieving additional ids for user %q", kubeletUser) + return 0, 0, fmt.Errorf("error retrieving additional uids for user %q: %w", kubeletUser, err) } outGids, err := exec.Command(cmd, "-g", kubeletUser).Output() if err != nil { @@ -162,6 +168,7 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { if string(outUids) != string(outGids) { return 0, 0, fmt.Errorf("mismatched subuids and subgids for user %q", kubeletUser) } + klog.V(5).InfoS("user namespaces: user found, using mappings from getsubids", "user", kubeletUser) return parseGetSubIdsOutput(string(outUids)) } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/userns/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/types.go new file mode 100644 index 0000000000..a0422d0042 --- /dev/null +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/types.go @@ -0,0 +1,29 @@ +/* +Copyright 2025 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package userns + +import "k8s.io/apimachinery/pkg/types" + +// Here go types that are common for all supported OS (windows, linux). + +type userNsPodsManager interface { + HandlerSupportsUserNamespaces(runtimeHandler string) (bool, error) + GetPodDir(podUID types.UID) string + ListPodsFromDisk() ([]types.UID, error) + GetKubeletMappings() (uint32, uint32, error) + GetMaxPods() int +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager.go index c431e0511a..c67fc7c453 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager.go @@ -1,3 +1,6 @@ +//go:build !windows +// +build !windows + /* Copyright 2022 The Kubernetes Authors. @@ -43,14 +46,6 @@ const userNsLength = (1 << 16) // since Go maps never free memory. const mapReInitializeThreshold = 1000 -type userNsPodsManager interface { - HandlerSupportsUserNamespaces(runtimeHandler string) (bool, error) - GetPodDir(podUID types.UID) string - ListPodsFromDisk() ([]types.UID, error) - GetKubeletMappings() (uint32, uint32, error) - GetMaxPods() int -} - type UsernsManager struct { used *allocator.AllocationBitmap usedBy map[types.UID]uint32 // Map pod.UID to range used @@ -132,7 +127,7 @@ func (m *UsernsManager) readMappingsFromFile(pod types.UID) ([]byte, error) { func MakeUserNsManager(kl userNsPodsManager) (*UsernsManager, error) { kubeletMappingID, kubeletMappingLen, err := kl.GetKubeletMappings() if err != nil { - return nil, err + return nil, fmt.Errorf("kubelet mappings: %w", err) } if kubeletMappingID%userNsLength != 0 { @@ -409,10 +404,15 @@ func (m *UsernsManager) GetOrCreateUserNamespaceMappings(pod *v1.Pod, runtimeHan // From here onwards, hostUsers=false and the feature gate is enabled. // if the pod requested a user namespace and the runtime doesn't support user namespaces then return an error. - if handlerSupportsUserns, err := m.kl.HandlerSupportsUserNamespaces(runtimeHandler); err != nil { - return nil, err - } else if !handlerSupportsUserns { - return nil, fmt.Errorf("RuntimeClass handler %q does not support user namespaces", runtimeHandler) + if handlerSupportsUserns, err := m.kl.HandlerSupportsUserNamespaces(runtimeHandler); err != nil || !handlerSupportsUserns { + msg := "can't set `spec.hostUsers: false`, runtime does not support user namespaces" + if runtimeHandler != "" { + msg = fmt.Sprintf("can't set `spec.hostUsers: false`, RuntimeClass handler %q does not support user namespaces", runtimeHandler) + } + if err != nil { + return nil, fmt.Errorf("%v: %w", msg, err) + } + return nil, fmt.Errorf("%v", msg) } m.lock.Lock() @@ -427,12 +427,12 @@ func (m *UsernsManager) GetOrCreateUserNamespaceMappings(pod *v1.Pod, runtimeHan if string(content) != "" { userNs, err = m.parseUserNsFileAndRecord(pod.UID, content) if err != nil { - return nil, err + return nil, fmt.Errorf("user namespace: %w", err) } } else { userNs, err = m.createUserNs(pod) if err != nil { - return nil, err + return nil, fmt.Errorf("create user namespace: %w", err) } } @@ -483,7 +483,7 @@ func (m *UsernsManager) CleanupOrphanedPodUsernsAllocations(pods []*v1.Pod, runn allFound := sets.NewString() found, err := m.kl.ListPodsFromDisk() if err != nil { - return err + return fmt.Errorf("user namespace: read pods from disk: %w", err) } for _, podUID := range found { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager_windows.go b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager_windows.go new file mode 100644 index 0000000000..bc40b71879 --- /dev/null +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/userns/userns_manager_windows.go @@ -0,0 +1,50 @@ +/* +Copyright 2025 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package userns + +import ( + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" +) + +type UsernsManager struct{} + +func MakeUserNsManager(kl userNsPodsManager) (*UsernsManager, error) { + return nil, nil +} + +// Release releases the user namespace allocated to the specified pod. +func (m *UsernsManager) Release(podUID types.UID) { + return +} + +func (m *UsernsManager) GetOrCreateUserNamespaceMappings(pod *v1.Pod, runtimeHandler string) (*runtimeapi.UserNamespace, error) { + return nil, nil +} + +// CleanupOrphanedPodUsernsAllocations reconciliates the state of user namespace +// allocations with the pods actually running. It frees any user namespace +// allocation for orphaned pods. +func (m *UsernsManager) CleanupOrphanedPodUsernsAllocations(pods []*v1.Pod, runningPods []*kubecontainer.Pod) error { + return nil +} + +func EnabledUserNamespacesSupport() bool { + return false +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 365be985de..3a973c2a6d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1280,7 +1280,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1339,7 +1339,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1386,7 +1386,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1454,7 +1454,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1626,13 +1626,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1979,7 +1979,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2002,14 +2002,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2043,7 +2043,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2056,7 +2056,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2073,20 +2073,20 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured/namedresources/cel -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2111,13 +2111,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2148,7 +2148,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2181,11 +2181,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2220,7 +2220,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2242,7 +2242,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3054,11 +3054,11 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/legacy-cloud-providers/gce k8s.io/legacy-cloud-providers/gce/gcpcredential -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3073,10 +3073,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3227,38 +3227,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250708171801-ce407c5220d0 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250611153038-0b41e7bf19a6 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 From a2882ebbb73035cb71fd1be7130c17dc48dfe3b5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:10 +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 5ba107493a..5cee934276 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,35 +150,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index e98ba57391..5d919e6f6a 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -200,20 +200,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:uj9xDi github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs= github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:zqzMxqY1vJ2OG1WxTjkoyGD62AHI/JuTxJtEkmkbgDc= github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d h1:HeB2bGaKXHRP/Iq1AVWyjaMgh56s4fS685rahQhkU30= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d h1:0K03Cm7N8qwVsWGXCjuxwds9ySVO+O83Stph1yGYcso= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d h1:ZlZ3BabWc79TL7Wy6/ZL+N8CIidjffw08V229apbXeo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d h1:7CxV8QZJEv35nUxhfUhI/wTE+8zoGiy7qFgy5+CjS2k= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d h1:gf+wsYXWmq6z0DBZs1TMXQ58jYnw472l+f/WbUNEDIo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d h1:dh8FTApwdIhVE9hcpVLacvmBdXJMz0uqQdo+LYZwih4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d h1:JP5rmdpzXncByR5j7pozlEbN+dcrycLqfZfgKK2PFxI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 h1:5Z/T4tzSVHpRdIjJsVWhJBSVrJzqOdZGX2yQx74X7qw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0/go.mod h1:Z9O9dB73uFCVGBCGtaZRflE7YrzFvXcH44SKBZ2cZDw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 h1:0zoINIuGB0vI4p/ScLDkyxxcecJ/Y146nKyKe4F8yXU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 h1:RV8U/FkulV7PhfiErika33ICcxwWU8Gn6I/pkQnfX6I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0/go.mod h1:ptDyVpCJkaKLikd4MUq8X1niFELVK0utQKhrfXePApY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 h1:prxKZWfVskq194odmdXsbctTkTE1EiXnXMxRIVGDimQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 h1:jbhv0VMVvA0j8fFrIeJwvLINjSSSx7XMUAa32YODHbU= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 h1:f81XR5nDzo49AO3exxrA6qdVJoGtovTxhJ5KcdP5W3A= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0/go.mod h1:vV2p5rFGPiN/xgdW/ww0t2WsL1ByM6AIFpNr6Nvha4c= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 h1:DWjyJJRnHMQP6vWg8saMutgLGA8LNWoTFx2ZVMYhFVM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 24781de8488c5d89840e8a40ffc159747ffde0fe Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:19 +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 499b2d5f81..4bd99a4a62 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -677,7 +677,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -733,17 +733,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -892,7 +892,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -929,7 +929,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1056,33 +1056,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250624145242-a5f4f8936f3d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250624145242-a5f4f8936f3d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250708171801-ce407c5220d0 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250708171801-ce407c5220d0 From 98f58c407a46c4070d90e8a35194f9895d430995 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:19 +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 f540b7fba2..4948c4e295 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:c180d9cd95583b5230411e1ec819716de4e62c0d514565c84a61f91cb370dbc4" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ebbc243622c27a6cc5d2b3f849749b38ede09916d7419d80c810ba171acc77e" 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 a71e792e97..1bb220e386 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:9d767f89fd08d48a96269a746f3ead9bcfd83c354dc14419c30ee75137bb6527" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcf6ef432bf823496a13436d5944111bf57ee6a062322d323dca768a7e8aa495" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 31816cd9059d180da557d558f4c6458af4016666 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:20 +0000 Subject: [PATCH 8/9] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 20 +++++++++---------- assets/release/release-x86_64.json | 20 +++++++++---------- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 1ec3029016..42c0374996 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:9af30845eebec9c83bacc5af3673d608b1ca7a70b4ec993035686a9f271fed4e + digest: sha256:f95fa2a49d1df86ccfd95716d9fc2dd4cd3755b0f473015c87eeec90ea810b38 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0229db7a7841a503b335ea73219469e4daf331223bbba904624e4f21a834fd6b + digest: sha256:985eec2a458ab3cbbcaafb722ba2657548febeb3176d5c3021bf3345fc0fe259 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 15e9514777..32c10fd730 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:9f82600c36268c5bd75088be113667315a22099004d73c03bb337ddb827c11c0 + digest: sha256:1848e676a710ae64d9537c6fa3e3706631fcc0a1f0fc972425bdcd872c2afa5f - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4342d5f1954a973a114bc32cd2052376cb4007589119e49097372ecb8f61a9d0 + digest: sha256:1ba1221574dda396a1bb0030192efb9fafbaea97e438d64921c2b76d286e49dd diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 56ce3711b0..3b54ca12c7 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-07-07-171451" + "base": "4.17.0-0.nightly-arm64-2025-07-16-182416" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9af30845eebec9c83bacc5af3673d608b1ca7a70b4ec993035686a9f271fed4e", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0229db7a7841a503b335ea73219469e4daf331223bbba904624e4f21a834fd6b" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f95fa2a49d1df86ccfd95716d9fc2dd4cd3755b0f473015c87eeec90ea810b38", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:985eec2a458ab3cbbcaafb722ba2657548febeb3176d5c3021bf3345fc0fe259" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 23a9a04204..0cf83e0a0d 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-2025-07-07-070757" + "base": "4.17.0-0.nightly-2025-07-16-160419" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f82600c36268c5bd75088be113667315a22099004d73c03bb337ddb827c11c0", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4342d5f1954a973a114bc32cd2052376cb4007589119e49097372ecb8f61a9d0" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1848e676a710ae64d9537c6fa3e3706631fcc0a1f0fc972425bdcd872c2afa5f", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba1221574dda396a1bb0030192efb9fafbaea97e438d64921c2b76d286e49dd" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index bb3fecb5c8..f2d99ef95d 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:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8 + digest: sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c + digest: sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4 + digest: sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d 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:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae - 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:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968 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 6018995a9c..6821b2638e 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:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d + digest: sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25 + digest: sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306 + digest: sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4 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:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e - 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:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index df90dca7e7..524fdbd0cf 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-07-07-171451" + "base": "4.17.0-0.nightly-arm64-2025-07-16-182416" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d" } } 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 53413967b0..074870bd2d 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2025-07-07-070757" + "base": "4.17.0-0.nightly-2025-07-16-160419" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 37202c7514..123a5f7904 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-07-07-171451" + "base": "4.17.0-0.nightly-arm64-2025-07-16-182416" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8e9fd0b34805e660b628976439f7433408d2f4550897380daf5dd7bc0061f12", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81ccc014853c72350e4156b5fb0b2b9bd9c81df2cc9788bf11e66e2ee0d6db96", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b378dea68c60c2b5b9a22ee1e3300158297d8cbeda78556e700d1fc4bf49ac05", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6449d04460c8d75056eafdd04623e3977ae9750fea65c0060cb6aad36ba1920", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d767f89fd08d48a96269a746f3ead9bcfd83c354dc14419c30ee75137bb6527", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d92f0b133bf23cac722fbc14750f091aad7bd1071a9e5a03bb512ae4452a876", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cee5c09a057ed7e65966cad2eba4c680fe63f988500343c2cc992cb27a372242", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7486777188bb38fadf700105513044a6f6cb8b726b7be4531ad420a0dd9898e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af6f4483396499a7f84e89ac6ba8b668307d3363524ccfd661509582352c482f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab6b2fa7dbbbfff359503dc62d57176c374ba7cb2b0d74f20eac1591dbbde1b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcf6ef432bf823496a13436d5944111bf57ee6a062322d323dca768a7e8aa495", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:899956e2c5a8efc11c5da4fa110107df4e3f266671da897c12ad57711ffb71f7", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c63313577712c6ac5080300cb3eadb50b12d9fb7455d112ba1930166dcee2f4", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0abd2125e92237e9389aa06716b33da0e66a7af0be81faffdd10b124c511408d" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15a0be524b8642a4efe257715c5aa71098f9c6f20ec5a4ed244fa939525a53f7", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1097230b548d9910833ecbb8f64e29c98fd9c93c792d64857b7eeef5f83cbcf" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index e579cbd999..c11f2c0844 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-2025-07-07-070757" + "base": "4.17.0-0.nightly-2025-07-16-160419" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba4651576ed2e980e71947d6e6fac9283965cf26031d3374f7f1d1c016a4bb3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eb6861a62c48e784e4fbe0ca780ac529858d36181b6346db5eed819bb015c35", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9db65cd5e8b7f592ffce13bec09077b5599ea405bd9f90ad1cebefba42b9f33", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42afed7b1f23ec300c9e971c44d80683fad1ab44d4562da8be3aebdcbe4d56b8", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c180d9cd95583b5230411e1ec819716de4e62c0d514565c84a61f91cb370dbc4", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1be5684ad230b919335d6c311e78b8619e559ea7f9bddd241cd3cdc0508f2c3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b2fd9d5e4cefc182da873d3b974c8d1531eb8097e068ea57410f3fe3b608f4e", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f2b976e8c3d2361eb4d3ef82fecaceb41dfa518b3c372baab985dfa97a4bbee", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c177cc02fc6d50e076465566b6c9711950f4932cd88ca1bf982e0662f1697e7f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f61ea653610599b1e0454f0d5b99b1da889e2110a8e5d97575bdb6e68a2be7a8", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ebbc243622c27a6cc5d2b3f849749b38ede09916d7419d80c810ba171acc77e", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01ff66dc47ec92f722869589f799069e04d6a004de64816c8ee1b1f181892f81", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bd2f848a3308e3c0e98c232c22bdfd91589a642fe5dea0503623313d98ca9e4", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf9318a782299872293aabed585be49eacafa4fc2b1af00339c13a885cce87e7" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f6546dd4897dd0e65497c76c43eeb7c1b8a8a0c631b591d8fa6ed77f41c8f3b", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02cc35a8b2d41121f9c540cc28e6231f7c8cf1456d3bc9747b7551aae7ce360f" } } From e83d3ab06193688e55229ea020963b625b7a47f9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 17 Jul 2025 04:25:21 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 4 ++-- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index c039b937bd..dbf89b542d 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 -KUBE_GIT_VERSION=v1.30.12 -KUBE_GIT_COMMIT=a5f4f8936f3df828973cf00299f26bb441a9244b +KUBE_GIT_VERSION=v1.30.14 +KUBE_GIT_COMMIT=ce407c5220d03860b36d8640286ae48521a0dc18 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b5085d5399..9af60cd4c5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2025-07-07-171451 +OCP_VERSION := 4.17.0-0.nightly-arm64-2025-07-16-182416 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index a67998d361..dd960edbd5 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2025-07-07-070757 +OCP_VERSION := 4.17.0-0.nightly-2025-07-16-160419