From 117b7a660a3caf4a6609cbad595abde4135f3e73 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:24:48 +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 6c2655b26f..1186ec9c53 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-2024-12-15-083313" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-12-15-102601" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-12-18-203600" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-12-18-233500" From 99975e63896495d162fb78ba21bf916072d59f4a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:24:48 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 65 +++++++++++++++++++------------ scripts/auto-rebase/commits.txt | 12 +++--- 2 files changed, 47 insertions(+), 30 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 752b892d5d..8ae6a337b0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,25 +1,42 @@ -- cluster-network-operator embedded-component c3e09bc436f73a60827d4c7c380dca700705047f to 3ec01ef2075fc94dfbade8441e6f13985f39303e - - 72c9115 2024-12-12T09:52:33+01:00 Cleanup ipsec entries from sidecar container - - 3892c72 2024-12-12T09:52:23+01:00 Remove ip xfrm state when IPsec is disabled - -- kubernetes embedded-component a5b43ecd85c008a57d346dbd53360c788a1a8bd1 to df0195cb1143b34da26b6aa490ab812036e77898 - - 458ca893b 2024-08-30T23:15:41+00:00 UPSTREAM: 126994: Add required FieldManager for validatingadmissionpolicy e2e - -- oc image-amd64 13001b02b86dbd91f65268fb93325e8c88164ee0 to f4525b82d768063bf14d5f15f0998d2217b7b792 - - 8effa800 2024-12-04T16:56:33+00:00 always retry in case of image pull error - -- ovn-kubernetes image-amd64 b7f678bef4af18ed556c537728736afe12a487b4 to 604f3cb92b77150ce1c66e147eddd0d553216441 - - 6ff5f727 2024-12-12T09:52:03+08:00 Bump OVS version to 3.4.0-18 - -- kubernetes image-amd64 a5b43ecd85c008a57d346dbd53360c788a1a8bd1 to df0195cb1143b34da26b6aa490ab812036e77898 - - 458ca893b 2024-08-30T23:15:41+00:00 UPSTREAM: 126994: Add required FieldManager for validatingadmissionpolicy e2e - -- oc image-arm64 13001b02b86dbd91f65268fb93325e8c88164ee0 to f4525b82d768063bf14d5f15f0998d2217b7b792 - - 8effa800 2024-12-04T16:56:33+00:00 always retry in case of image pull error - -- ovn-kubernetes image-arm64 b7f678bef4af18ed556c537728736afe12a487b4 to 604f3cb92b77150ce1c66e147eddd0d553216441 - - 6ff5f727 2024-12-12T09:52:03+08:00 Bump OVS version to 3.4.0-18 - -- kubernetes image-arm64 a5b43ecd85c008a57d346dbd53360c788a1a8bd1 to df0195cb1143b34da26b6aa490ab812036e77898 - - 458ca893b 2024-08-30T23:15:41+00:00 UPSTREAM: 126994: Add required FieldManager for validatingadmissionpolicy e2e +- cluster-network-operator embedded-component 3ec01ef2075fc94dfbade8441e6f13985f39303e to 37be1f8c3b4296048a2bd385ffc6636fc3603f38 + - 491050f 2024-12-13T14:14:19+01:00 Skip including default crypto policies to avoid authby issue + +- etcd embedded-component c82057da87388662904654d4f01acd06595ee22d to 23c5a247c3e601f7806a0bbffdc6d201a55bf469 + - d26fba86 2024-10-29T15:37:16-04:00 Add support for cachi2 based deps + +- kubernetes embedded-component df0195cb1143b34da26b6aa490ab812036e77898 to f868289cea8577c895fa957b466f209b9af6a1a2 + - c0eea14a8 2024-12-12T12:22:30-05:00 UPSTREAM: : PR-124064 fix grace period used for immediate evictions + - f6a95ed8e 2024-12-10T05:03:35+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 6eb00ed1c 2024-12-10T04:49:54+00:00 UPSTREAM: : manually resolve conflicts + - 0c76c645d 2024-11-19T17:26:34+00:00 Release commit for Kubernetes v1.30.7 + - ff3d440e2 2024-10-31T08:48:47+01:00 server/config: assing system:apiserver user to system:authenticated group + - df37614d6 2024-10-30T15:38:09+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 02ed463dc 2024-10-22T20:53:51+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.6 + - f08622720 2024-09-24T07:29:06+00:00 tests for nodes with different nodeName and name + - b1c9d7eb0 2024-09-24T07:24:26+00:00 manually revert #109877 + +- operator-framework-olm embedded-component 649dfc4dc0a7fca1c25c7678665a55ad8ce53040 to a8acb3d612717850bff384af0eaa06b6f0f5e136 + - 794452ad 2024-12-11T14:51:46+00:00 CRD upgrade existing CR validation fix (#3442) + +- kubernetes image-amd64 df0195cb1143b34da26b6aa490ab812036e77898 to f868289cea8577c895fa957b466f209b9af6a1a2 + - c0eea14a8 2024-12-12T12:22:30-05:00 UPSTREAM: : PR-124064 fix grace period used for immediate evictions + - f6a95ed8e 2024-12-10T05:03:35+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 6eb00ed1c 2024-12-10T04:49:54+00:00 UPSTREAM: : manually resolve conflicts + - 0c76c645d 2024-11-19T17:26:34+00:00 Release commit for Kubernetes v1.30.7 + - ff3d440e2 2024-10-31T08:48:47+01:00 server/config: assing system:apiserver user to system:authenticated group + - df37614d6 2024-10-30T15:38:09+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 02ed463dc 2024-10-22T20:53:51+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.6 + - f08622720 2024-09-24T07:29:06+00:00 tests for nodes with different nodeName and name + - b1c9d7eb0 2024-09-24T07:24:26+00:00 manually revert #109877 + +- kubernetes image-arm64 df0195cb1143b34da26b6aa490ab812036e77898 to f868289cea8577c895fa957b466f209b9af6a1a2 + - c0eea14a8 2024-12-12T12:22:30-05:00 UPSTREAM: : PR-124064 fix grace period used for immediate evictions + - f6a95ed8e 2024-12-10T05:03:35+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 6eb00ed1c 2024-12-10T04:49:54+00:00 UPSTREAM: : manually resolve conflicts + - 0c76c645d 2024-11-19T17:26:34+00:00 Release commit for Kubernetes v1.30.7 + - ff3d440e2 2024-10-31T08:48:47+01:00 server/config: assing system:apiserver user to system:authenticated group + - df37614d6 2024-10-30T15:38:09+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. + - 02ed463dc 2024-10-22T20:53:51+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.6 + - f08622720 2024-09-24T07:29:06+00:00 tests for nodes with different nodeName and name + - b1c9d7eb0 2024-09-24T07:24:26+00:00 manually revert #109877 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e05d18c9cd..fbc3ad868a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,16 +5,16 @@ https://github.com/openshift/cluster-ingress-operator embedded-component cb5306d https://github.com/openshift/cluster-kube-apiserver-operator embedded-component aa95a2b0ecfe4892d6a936bb2da58412edce0fe0 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 -https://github.com/openshift/cluster-network-operator embedded-component 3ec01ef2075fc94dfbade8441e6f13985f39303e +https://github.com/openshift/cluster-network-operator embedded-component 37be1f8c3b4296048a2bd385ffc6636fc3603f38 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2b962c71d5b3ac179898dc1ece6a98de0b33cd70 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 c82057da87388662904654d4f01acd06595ee22d -https://github.com/openshift/kubernetes embedded-component df0195cb1143b34da26b6aa490ab812036e77898 +https://github.com/openshift/etcd embedded-component 23c5a247c3e601f7806a0bbffdc6d201a55bf469 +https://github.com/openshift/kubernetes embedded-component f868289cea8577c895fa957b466f209b9af6a1a2 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 https://github.com/openshift/machine-config-operator embedded-component 119a374e94ea622c080409cc82f106ac737d4e85 https://github.com/openshift/openshift-controller-manager embedded-component f299e54abad2f06a51f95bf40b611a5f1519b31e -https://github.com/openshift/operator-framework-olm embedded-component 649dfc4dc0a7fca1c25c7678665a55ad8ce53040 +https://github.com/openshift/operator-framework-olm embedded-component a8acb3d612717850bff384af0eaa06b6f0f5e136 https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-amd64 f4525b82d768063bf14d5f15f0998d2217b7b792 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc5523 https://github.com/openshift/router image-amd64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a https://github.com/openshift/kube-rbac-proxy image-amd64 7718265cc7640f6fa0d75eee366e424911d6f00f https://github.com/openshift/ovn-kubernetes image-amd64 604f3cb92b77150ce1c66e147eddd0d553216441 -https://github.com/openshift/kubernetes image-amd64 df0195cb1143b34da26b6aa490ab812036e77898 +https://github.com/openshift/kubernetes image-amd64 f868289cea8577c895fa957b466f209b9af6a1a2 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-arm64 f4525b82d768063bf14d5f15f0998d2217b7b792 https://github.com/openshift/coredns image-arm64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1 @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc5523 https://github.com/openshift/router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a https://github.com/openshift/kube-rbac-proxy image-arm64 7718265cc7640f6fa0d75eee366e424911d6f00f https://github.com/openshift/ovn-kubernetes image-arm64 604f3cb92b77150ce1c66e147eddd0d553216441 -https://github.com/openshift/kubernetes image-arm64 df0195cb1143b34da26b6aa490ab812036e77898 +https://github.com/openshift/kubernetes image-arm64 f868289cea8577c895fa957b466f209b9af6a1a2 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From b7808b55dd4ccab13f1226984e2375e55e45ce7e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:16 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 68 ++++++++++++++++----------------- go.sum | 116 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/go.mod b/go.mod index f857063ec7..0ce0b6adab 100644 --- a/go.mod +++ b/go.mod @@ -219,44 +219,44 @@ 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-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241212083346-df0195cb1143 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241212083346-df0195cb1143 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241217201916-f868289cea85 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241217201916-f868289cea85 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 // 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-20241212083346-df0195cb1143 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 // staging kubernetes diff --git a/go.sum b/go.sum index 81716bee01..6a1caa18ce 100644 --- a/go.sum +++ b/go.sum @@ -461,66 +461,66 @@ github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEco github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8= github.com/openshift/cluster-policy-controller v0.0.0-20240912153445-7209e90d4205 h1:0BJ5e4qV2RQKz+4yeQrKIi5PJQ/HlcK9I7jEFhcoB4s= github.com/openshift/cluster-policy-controller v0.0.0-20240912153445-7209e90d4205/go.mod h1:kcmuMziFH9/IdFAZwbBwO49c4Dspy+hsvHeV2nC3b4A= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 h1:nH9h8ex6CjwTMwG8+4cR7nOE4JSr7GsaBp5p0qYB2/U= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 h1:mMAFnePIgeHQvSxVdSdbUSkMpJVnjVvg5Z/Ogz3Ut8w= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 h1:M6iiIP5RIDfTwcgzrlPX+xwarajnWYEy0+EVbLeQc3M= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= -github.com/openshift/kubernetes v0.0.0-20241212083346-df0195cb1143 h1:7Ou7HRVk4/Lk0K1mfhKOXI9hKWxagxVhwZv/rIsb70E= -github.com/openshift/kubernetes v0.0.0-20241212083346-df0195cb1143/go.mod h1:Xz/c0S2YBS1PKggg6PQ7JohS9wABzSzjS5KwXwR4X/8= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:q8t99va0HrgK4CM91e3Xp0ABroQ3yDxTxrgj+eb5Q94= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:tO28zSdnRHM4dldp7fcahthd20wHrMCbAwoxxLNa0a8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:RZs6NL6vmEprFacUTbjtH46yi5Ebo4xJSv/xXhpjOEA= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +github.com/openshift/kubernetes v0.0.0-20241217201916-f868289cea85 h1:0ba2rqJbc92vBx0L49OUyPTSb5NgsgelhpKUkHioFUM= +github.com/openshift/kubernetes v0.0.0-20241217201916-f868289cea85/go.mod h1:Xz/c0S2YBS1PKggg6PQ7JohS9wABzSzjS5KwXwR4X/8= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 h1:Eq3Ql8dFdv5hvkxKGTxxLb22xcin771AvZj+24HlCI0= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143 h1:3gsYkDOXoQixbKKLfHEWXEKvpU9sOdtmHm8Mtn4mRz8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143 h1:JRuVLpIHDzO0E7dJMhbV6lfYVo9CK/ZFdtMt1Bgu4A0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143/go.mod h1:fAMOb/XmkaxSaGUkmL1JKZ+hsmKdhKlMgTYqNi/74S0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 h1:Wi2lf7KTTiMEsQSNDPiS1mf+PtHPn8jqMQrp7pvHnAA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 h1:1MPdQf1d+HVofIhaQHWq1kyGa+/TajSSyIzMpyKUVvk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143/go.mod h1:QccKWHsgfAOxwaELZrfb91p0oLa6fL+/VswtmDD7pN0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 h1:xd0e3NsteTm16PUKZlHecUVV7ZxAnAEgxpEvMGmhNqw= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 h1:STlsOknzUEt6IH5PLredO7hyKxha9qMZyFVqoqndrCg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143 h1:ITHUZLvDzFkpWsBhbCflaFctExDC+L7jJEO6WY3+6bY= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143 h1:s8nFi2WMPdVz9kx+iHZuJ4DZixtGCsaNWxjTf+UeWa4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 h1:FEd9XpE0ynPiY7cTC1Lx+9nqgE9dVHl315Fa2mm1K3Q= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143 h1:sHdZRwrohfGdNWcH17zdTjirp6a7uDuOVGkYrCNoecU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143/go.mod h1:6EedmW880eVD6uU+oghYW6V2bSO9seMLzd/HIRCDFF8= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143 h1:Juu0WpwM1q+9G/TJj4G6f3p+dQxlYVdJHMuqBFu8ogM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143 h1:LG2rX04+FjjSen7yLRoGd8r8pwQyWwyICDJ4t8zh7a4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143 h1:RmeqLb9SqJvPUeGI3Lee6TQyPv/hDNDm56RbHvpgm14= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143 h1:XZfxKCNzC5edLmEpYUmHETQKTyWmOr/ZQaK5qXWvxQs= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241212083346-df0195cb1143 h1:RDKlt+v4YPFkJbhpnoSboeAzqEeNoI4ywmveV5CEkDY= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241212083346-df0195cb1143/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143 h1:kTrkEgdUH810tmgEiypB3GA5q0ztx1Ptv7dVbMR+LOM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143 h1:nuEy9UjcLHA0n31eF4/x3vvyKycj6ip8z1DNskug2oY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143/go.mod h1:jrGMOd6XyjYE6bhCRzoUIbwUhv5f4q/gpBD7BOMDBEY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143 h1:b6sG6kJZGMTFu019AUwx4/oaDal/NUugMjHivDg/Y5Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143 h1:io/xjS/ClTkOY05tV4sGlprNeeQEvt/qAGouoZ5xx9I= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 h1:DUvRsZVulYYl1lecjvNiD1VWiMjBohalrltWjtVC310= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143 h1:149oCCGQ+Ctla6TygSbUgwZubIAKsWwXJudBGKPnlPM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143 h1:22OdfJ0o18GJpgSzsZPr3z6aDqz4vb5RdJX2w8XYZVE= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143 h1:YK6nZLR7z/Jna+Oo+qzQ68AVBFAJHqbHVFr3biCtgKs= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143 h1:vouxiPsw8twwJt7ghbu5N5YwfMtNvQfKCBGbVSuQB1E= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143 h1:rwm+MySsp1WL9xN+F9oEnuUoLbjLNfZwIAywAFzCr7s= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 h1:+hxCWYYbzbjWxlomYodokR9lLwT+uCUpUQFCq9OrDsM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 h1:zrba8FqLqWLS2Kj6vQV2fiKLvwOYmn66LFkzh9FZUcM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85/go.mod h1:fAMOb/XmkaxSaGUkmL1JKZ+hsmKdhKlMgTYqNi/74S0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 h1:lNzrSCThTMeub+QnmdqVSTznY0kBj+MTpUWgyp23qKA= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 h1:h0GALa/OB87Y6PpXfXfjbvS5Gvz4U/jQ3dpJNZKULJo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85/go.mod h1:QccKWHsgfAOxwaELZrfb91p0oLa6fL+/VswtmDD7pN0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 h1:H2wzjcCzeXgRyhTRTYXvGL0kKhX97i4jvnK/Xyt9NzI= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 h1:8gfIs+oywi4+pavKiZCVHuwb7ywYOuN4dDX0/h2svc8= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 h1:7/n8+fhv+4qvhJSIvkegrP725nDPxjWu0Y2ERxqQaEg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 h1:MXobjFxp9Sw1HzWIZTDpF3WLT1VOjGsj0dZ1FklHeV8= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 h1:wxZd69zzPfKGw8B5LkNIG06w906YtBzpDsf7oXu/01M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 h1:2csk6MggBshc+LerU3zp9COPGvZFr9odMVgq6NA5G4I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85/go.mod h1:6EedmW880eVD6uU+oghYW6V2bSO9seMLzd/HIRCDFF8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 h1:4pGl0QEWuuF6GBPNdoaG5G/dVXHl/IuYmi8DO3RqcKY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 h1:xry5iTOejf9xc23Gte460nrhHPYaMYcGYuAERIBmN2k= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 h1:YUaGc8rhcM+xL/xFa3Zptusv7e+f+t6tTc+LJXo8oNA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 h1:DiNsaks94XF0ZBnYQqcBjiXpQWeICqWNyQVO2uwWDlo= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85/go.mod h1:Bg9hersDf5nuccjVg3F+OKtmbZxYfmH3jp/2hT1djRA= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 h1:DJrwXvSUuULNx4UIHnoNmad0roxlBV/LO7Z75ShZP3g= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 h1:f+mUuS2xVezfvtqMSrp1YLAteog2uK2JPcWoSzXQQPQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 h1:2FLk6tZ8KI9n05Q6zIqVoG3nRejMXAl1CanmTxij3H0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85/go.mod h1:jrGMOd6XyjYE6bhCRzoUIbwUhv5f4q/gpBD7BOMDBEY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 h1:oHgo6jIvePTOmYiycGeoQbd6ERsaLcAj1Jmyb8KLKOY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 h1:eNOP5Us253nQwu+o3HDZWsrwDUvuRoJADfzj8YK9NQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 h1:FQrrf0h2Vay6QwI4t24QiOQNv62oy5/A65nIFtVr9nw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 h1:ogbv+oO7BiZApgNVOVhkc8S0RMgbstOvRHbxnWh57JQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 h1:r0UOziUs9o7Ry8nZ0gGcflgAIBrLLjymu9tYsiuo/3o= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 h1:k80gsDuJX87dn6Z6z8H4sRnVkivPkGGOG0ZtUwX2JFg= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 h1:Mk7dsOGfoxmx2C/XD7fh56Y/n96FbEZg+vcnHjMj5zA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 h1:mGa8KB3nHJS/ieZy7OYIpmoyW7042omWuMVFPcydH5U= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85/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 362f54bf1f29709ee8d78e72aa38dc343a9da33e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:34 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/k8s.io/apiserver/pkg/server/config.go | 2 +- .../pkg/kubelet/eviction/eviction_manager.go | 11 +- .../kubernetes/pkg/kubelet/pod_workers.go | 5 +- .../defaultpreemption/default_preemption.go | 7 + vendor/modules.txt | 126 +++++++++--------- 5 files changed, 82 insertions(+), 69 deletions(-) diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go index cc82d9db6e..06f8c45a41 100644 --- a/vendor/k8s.io/apiserver/pkg/server/config.go +++ b/vendor/k8s.io/apiserver/pkg/server/config.go @@ -1219,7 +1219,7 @@ func AuthorizeClientBearerToken(loopback *restclient.Config, authn *Authenticati tokens[privilegedLoopbackToken] = &user.DefaultInfo{ Name: user.APIServerUser, UID: uid, - Groups: []string{user.SystemPrivilegedGroup}, + Groups: []string{user.AllAuthenticated, user.SystemPrivilegedGroup}, } tokenAuthenticator := authenticatorfactory.NewFromTokens(tokens, authn.APIAudiences) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go index fdb6c72e6e..a94d87bac0 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go @@ -56,6 +56,9 @@ const ( signalEphemeralPodFsLimit string = "ephemeralpodfs.limit" // signalEmptyDirFsLimit is amount of storage available on filesystem requested by an emptyDir signalEmptyDirFsLimit string = "emptydirfs.limit" + // immediateEvictionGracePeriodSeconds is how long we give pods to shut down when we + // need them to evict quickly due to resource pressure + immediateEvictionGracePeriodSeconds = 1 ) // managerImpl implements Manager @@ -405,7 +408,7 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act // we kill at most a single pod during each eviction interval for i := range activePods { pod := activePods[i] - gracePeriodOverride := int64(0) + gracePeriodOverride := int64(immediateEvictionGracePeriodSeconds) if !isHardEvictionThreshold(thresholdToReclaim) { gracePeriodOverride = m.config.MaxPodGracePeriodSeconds } @@ -525,7 +528,7 @@ func (m *managerImpl) emptyDirLimitEviction(podStats statsapi.PodStats, pod *v1. used := podVolumeUsed[pod.Spec.Volumes[i].Name] if used != nil && size != nil && size.Sign() == 1 && used.Cmp(*size) > 0 { // the emptyDir usage exceeds the size limit, evict the pod - if m.evictPod(pod, 0, fmt.Sprintf(emptyDirMessageFmt, pod.Spec.Volumes[i].Name, size.String()), nil, nil) { + if m.evictPod(pod, immediateEvictionGracePeriodSeconds, fmt.Sprintf(emptyDirMessageFmt, pod.Spec.Volumes[i].Name, size.String()), nil, nil) { metrics.Evictions.WithLabelValues(signalEmptyDirFsLimit).Inc() return true } @@ -553,7 +556,7 @@ func (m *managerImpl) podEphemeralStorageLimitEviction(podStats statsapi.PodStat if podEphemeralStorageTotalUsage.Cmp(podEphemeralStorageLimit) > 0 { // the total usage of pod exceeds the total size limit of containers, evict the pod message := fmt.Sprintf(podEphemeralStorageMessageFmt, podEphemeralStorageLimit.String()) - if m.evictPod(pod, 0, message, nil, nil) { + if m.evictPod(pod, immediateEvictionGracePeriodSeconds, message, nil, nil) { metrics.Evictions.WithLabelValues(signalEphemeralPodFsLimit).Inc() return true } @@ -579,7 +582,7 @@ func (m *managerImpl) containerEphemeralStorageLimitEviction(podStats statsapi.P if ephemeralStorageThreshold, ok := thresholdsMap[containerStat.Name]; ok { if ephemeralStorageThreshold.Cmp(*containerUsed) < 0 { - if m.evictPod(pod, 0, fmt.Sprintf(containerEphemeralStorageMessageFmt, containerStat.Name, ephemeralStorageThreshold.String()), nil, nil) { + if m.evictPod(pod, immediateEvictionGracePeriodSeconds, fmt.Sprintf(containerEphemeralStorageMessageFmt, containerStat.Name, ephemeralStorageThreshold.String()), nil, nil) { metrics.Evictions.WithLabelValues(signalEphemeralContainerFsLimit).Inc() return true } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/pod_workers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/pod_workers.go index 8be367f8f0..30850d830f 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/pod_workers.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/pod_workers.go @@ -979,10 +979,12 @@ func calculateEffectiveGracePeriod(status *podSyncStatus, pod *v1.Pod, options * // enforce the restriction that a grace period can only decrease and track whatever our value is, // then ensure a calculated value is passed down to lower levels gracePeriod := status.gracePeriod + overridden := false // this value is bedrock truth - the apiserver owns telling us this value calculated by apiserver if override := pod.DeletionGracePeriodSeconds; override != nil { if gracePeriod == 0 || *override < gracePeriod { gracePeriod = *override + overridden = true } } // we allow other parts of the kubelet (namely eviction) to request this pod be terminated faster @@ -990,12 +992,13 @@ func calculateEffectiveGracePeriod(status *podSyncStatus, pod *v1.Pod, options * if override := options.PodTerminationGracePeriodSecondsOverride; override != nil { if gracePeriod == 0 || *override < gracePeriod { gracePeriod = *override + overridden = true } } } // make a best effort to default this value to the pod's desired intent, in the event // the kubelet provided no requested value (graceful termination?) - if gracePeriod == 0 && pod.Spec.TerminationGracePeriodSeconds != nil { + if !overridden && gracePeriod == 0 && pod.Spec.TerminationGracePeriodSeconds != nil { gracePeriod = *pod.Spec.TerminationGracePeriodSeconds } // no matter what, we always supply a grace period of 1 diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go index 4ead255aca..8594a44748 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go @@ -191,6 +191,8 @@ func (pl *DefaultPreemption) SelectVictimsOnNode( } var victims []*v1.Pod numViolatingVictim := 0 + // Sort potentialVictims by pod priority from high to low, which ensures to + // reprieve higher priority pods first. sort.Slice(potentialVictims, func(i, j int) bool { return util.MoreImportantPod(potentialVictims[i].Pod, potentialVictims[j].Pod) }) // Try to reprieve as many pods as possible. We first try to reprieve the PDB // violating victims and then other non-violating ones. In both cases, we start @@ -225,6 +227,11 @@ func (pl *DefaultPreemption) SelectVictimsOnNode( return nil, 0, framework.AsStatus(err) } } + + // Sort victims after reprieving pods to keep the pods in the victims sorted in order of priority from high to low. + if len(violatingVictims) != 0 && len(nonViolatingVictims) != 0 { + sort.Slice(victims, func(i, j int) bool { return util.MoreImportantPod(victims[i], victims[j]) }) + } return victims, numViolatingVictim, framework.NewStatus(framework.Success) } diff --git a/vendor/modules.txt b/vendor/modules.txt index a25452015b..fe00e5664d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -868,7 +868,7 @@ github.com/vishvananda/netns # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -876,7 +876,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -884,7 +884,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -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-20241212083346-df0195cb1143 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241212083346-df0195cb1143 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241212083346-df0195cb1143 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241212083346-df0195cb1143 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241217201916-f868289cea85 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241217201916-f868289cea85 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241217201916-f868289cea85 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241212083346-df0195cb1143 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 From ffcdd6bb43326b969de06e4bdc5043004a4378e2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:34 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 72 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 52 +++++++++++++++++++------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 6295432cc9..3add1b90f4 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,41 +144,41 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241004120024-c82057da8738 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241212083346-df0195cb1143 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241212083346-df0195cb1143 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241216221321-23c5a247c3e6 // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241217201916-f868289cea85 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241217201916-f868289cea85 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241212083346-df0195cb1143 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 54fa50d8eb..27e47fc6fe 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -188,32 +188,32 @@ github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9Xa github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 h1:nH9h8ex6CjwTMwG8+4cR7nOE4JSr7GsaBp5p0qYB2/U= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 h1:mMAFnePIgeHQvSxVdSdbUSkMpJVnjVvg5Z/Ogz3Ut8w= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 h1:M6iiIP5RIDfTwcgzrlPX+xwarajnWYEy0+EVbLeQc3M= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 h1:3Dgvb0Jm/nNeUbI5UJovW2TFFxRgiWMWxuyy7In63uI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241004120024-c82057da8738 h1:qYjEjTMVyzwcb4onm2OYuFsiPbq6u3wgP3oatWm2lW8= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241004120024-c82057da8738 h1:OKQCFj6Cit/S2EsvRreB8GLK8BPj+gJM9Mk2YTZ+6Fo= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241004120024-c82057da8738/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143 h1:3gsYkDOXoQixbKKLfHEWXEKvpU9sOdtmHm8Mtn4mRz8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 h1:Wi2lf7KTTiMEsQSNDPiS1mf+PtHPn8jqMQrp7pvHnAA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 h1:1MPdQf1d+HVofIhaQHWq1kyGa+/TajSSyIzMpyKUVvk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143/go.mod h1:QccKWHsgfAOxwaELZrfb91p0oLa6fL+/VswtmDD7pN0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 h1:xd0e3NsteTm16PUKZlHecUVV7ZxAnAEgxpEvMGmhNqw= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 h1:STlsOknzUEt6IH5PLredO7hyKxha9qMZyFVqoqndrCg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 h1:FEd9XpE0ynPiY7cTC1Lx+9nqgE9dVHl315Fa2mm1K3Q= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 h1:DUvRsZVulYYl1lecjvNiD1VWiMjBohalrltWjtVC310= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:q8t99va0HrgK4CM91e3Xp0ABroQ3yDxTxrgj+eb5Q94= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:tO28zSdnRHM4dldp7fcahthd20wHrMCbAwoxxLNa0a8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:RZs6NL6vmEprFacUTbjtH46yi5Ebo4xJSv/xXhpjOEA= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:pn/aSjC3oDA9vRcqrcNNp7knFk0Jwp8PIUn41mBlr6M= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:GKWBd/sDdcnHOQDbJ8Rer25157u5MO56Rkkujz2xtzA= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +github.com/openshift/etcd/server/v3 v3.5.1-0.20241216221321-23c5a247c3e6 h1:D/5AeEYOZ2BrgoZhg8j0zRqFRn2TfqB4fkQc2TcS72I= +github.com/openshift/etcd/server/v3 v3.5.1-0.20241216221321-23c5a247c3e6/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 h1:+hxCWYYbzbjWxlomYodokR9lLwT+uCUpUQFCq9OrDsM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 h1:lNzrSCThTMeub+QnmdqVSTznY0kBj+MTpUWgyp23qKA= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 h1:h0GALa/OB87Y6PpXfXfjbvS5Gvz4U/jQ3dpJNZKULJo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85/go.mod h1:QccKWHsgfAOxwaELZrfb91p0oLa6fL+/VswtmDD7pN0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 h1:H2wzjcCzeXgRyhTRTYXvGL0kKhX97i4jvnK/Xyt9NzI= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 h1:8gfIs+oywi4+pavKiZCVHuwb7ywYOuN4dDX0/h2svc8= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85/go.mod h1:g3pPLEYHoJ3ZB1ZaRa8usjcjlRUtG/W4SCs0678c7wA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 h1:wxZd69zzPfKGw8B5LkNIG06w906YtBzpDsf7oXu/01M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 h1:FQrrf0h2Vay6QwI4t24QiOQNv62oy5/A65nIFtVr9nw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85/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 13d3a51af30a8f76b2779992f10d21c3596bfcbd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:42 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 98 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index ae7be0cd70..4f214b15cb 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -270,7 +270,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -279,7 +279,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -292,14 +292,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.16 ## explicit; go 1.22 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/pkg/v3 v3.5.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -316,14 +316,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/raft/v3 v3.5.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241004120024-c82057da8738 +# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241216221321-23c5a247c3e6 ## explicit; go 1.22 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -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-20241212083346-df0195cb1143 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 ## 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-20241212083346-df0195cb1143 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1050,39 +1050,39 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241004120024-c82057da8738 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241004120024-c82057da8738 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241212083346-df0195cb1143 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241212083346-df0195cb1143 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241212083346-df0195cb1143 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241212083346-df0195cb1143 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241212083346-df0195cb1143 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241212083346-df0195cb1143 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241212083346-df0195cb1143 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241212083346-df0195cb1143 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241212083346-df0195cb1143 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241212083346-df0195cb1143 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241212083346-df0195cb1143 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241212083346-df0195cb1143 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241212083346-df0195cb1143 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241212083346-df0195cb1143 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241212083346-df0195cb1143 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241212083346-df0195cb1143 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241212083346-df0195cb1143 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241212083346-df0195cb1143 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241216221321-23c5a247c3e6 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241217201916-f868289cea85 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241217201916-f868289cea85 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241217201916-f868289cea85 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241217201916-f868289cea85 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241217201916-f868289cea85 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241217201916-f868289cea85 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241217201916-f868289cea85 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241217201916-f868289cea85 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241217201916-f868289cea85 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241217201916-f868289cea85 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241217201916-f868289cea85 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241217201916-f868289cea85 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241217201916-f868289cea85 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241217201916-f868289cea85 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241217201916-f868289cea85 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241217201916-f868289cea85 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241217201916-f868289cea85 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241217201916-f868289cea85 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241217201916-f868289cea85 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241217201916-f868289cea85 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241217201916-f868289cea85 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241217201916-f868289cea85 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241217201916-f868289cea85 From 01e20650dd251e75af7ed83d72a222d145eeee2f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:42 +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 37de5530c9..7722320833 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:6f9c12df3f9cdfbdb81d02a9ef205f3749524c2ec0f3418ed7123f545671836b" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a8e32596eb5ca9e3774c93633fdeecfef67ce3feee91fa948b910a16898eb0" 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 fc310f3096..0930f41f53 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:43b54d4c0e4c54b6baa274dd5da8b79472e0ca202b90135a6e327327c463eb21" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33b3a5bc8407432c094d00a87d963a0e6c2f3c13486c2ccc6f00a541e74be54d" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 10ada5be62205578244e9c84fb0c5740ab71ad8a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:44 +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 2a042b9f5b..08dca75f81 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:5181e105167cf80e454e261a1159af1173f8e877901cac498c2a06617eb88810 + digest: sha256:9928ae684f0c0386863e36cef288c11798259e35ff1512458441bd2c847d0b59 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:aef47bc2ae5ae00bbbae8c6700258ca4bbe2fe0d2c823d4087808a6df419484c + digest: sha256:350632f487385b2dfb497940eaf557f14bd3c3452db7fe9d8391554f2441e072 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index ccecbd95d3..4c8844fa28 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:14777fdf27f2d34051f5f6c3b3a7fbb5bbb7e72695f6c1f830670677da0b4d5a + digest: sha256:01c5940636c31985b7ce70971230ba78042df3d456c740b2f89cd6e8736f7bad - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f646827fbd45ce9bc1fe11433a67cd5ae25d6c14d67051233288fa7fbd929c21 + digest: sha256:8f8ed8ec72082e9206c06c37806c7aa3b5d9344860068e09f5b50c9513757b13 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index e7bef9c964..35d7efca12 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-2024-12-15-102601" + "base": "4.17.0-0.nightly-arm64-2024-12-18-233500" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5181e105167cf80e454e261a1159af1173f8e877901cac498c2a06617eb88810", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aef47bc2ae5ae00bbbae8c6700258ca4bbe2fe0d2c823d4087808a6df419484c" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9928ae684f0c0386863e36cef288c11798259e35ff1512458441bd2c847d0b59", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:350632f487385b2dfb497940eaf557f14bd3c3452db7fe9d8391554f2441e072" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index b02c1e317e..466015ca44 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-2024-12-15-083313" + "base": "4.17.0-0.nightly-2024-12-18-203600" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14777fdf27f2d34051f5f6c3b3a7fbb5bbb7e72695f6c1f830670677da0b4d5a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f646827fbd45ce9bc1fe11433a67cd5ae25d6c14d67051233288fa7fbd929c21" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01c5940636c31985b7ce70971230ba78042df3d456c740b2f89cd6e8736f7bad", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f8ed8ec72082e9206c06c37806c7aa3b5d9344860068e09f5b50c9513757b13" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 5b0a995a1b..d66be4ec29 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:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6 + digest: sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8 + digest: sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a + digest: sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87 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:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc - 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:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af 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 a581c4fc8f..585e784f60 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:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb + digest: sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1 + digest: sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17 + digest: sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990 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:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be - 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:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f 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 3e9730e0ce..3e005085b0 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-2024-12-15-102601" + "base": "4.17.0-0.nightly-arm64-2024-12-18-233500" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afbe6fe6782e10272911b6a719b9ea35593623a7756df5111e6e797773f72ec6", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf944171926cef99d783ecc7b165f9828d7fc9aedb00f5603a172e73f7410ea8", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:843e4d3c1c5220ce05e3af0f44c07ca47c931a585f4422b23c832f9c888276af", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76cc0d0a735854d1f045d5bc6c910dc9079e187be943df5c7a89ea437264f6bc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87" } } 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 63cc94874b..e60e1d1202 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-2024-12-15-083313" + "base": "4.17.0-0.nightly-2024-12-18-203600" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17ff052a9579bae623a6d60fa2fcf24c02bae8f550c9effe23a3500f3c5e65fb", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3248ccf6fb6fb425ab1f300928fa2c05081a1c814867d0576d6a8d778582ade1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9a022a664f62e1802b0659c0bbf641a274b85a554876f145198b50ca52367f", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1e7b0ad44694f1dfcf740ca2c360f35a80b9ff084822bcab888bc198a05be", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 3945041c36..ddba1ba64f 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-2024-12-15-102601" + "base": "4.17.0-0.nightly-arm64-2024-12-18-233500" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c8574b6adf8204986ad807cdf242acb2a04566c6fe87a477b5479d9855cadfd", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e3ee21b24a05c31845ef8b7921609279252b15b1b28ac92d4028a0ff02dbb4d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3eae1ff6d43e4252e03e3b931d4e9fc0f31ecb3e9e441ee517c28fcdf938b9f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d431cca56299893e8bf8d1f38fb6ef85afa9cd583b12b580a2ce635299ce66a", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8de17e70dccf7b9e91927f905d74e7437dc837268b80080aa4d2d93772c5f2fd", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43b54d4c0e4c54b6baa274dd5da8b79472e0ca202b90135a6e327327c463eb21", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae2fb9427a64b877ef894e151f06c152b2a17a88b4880693fcca970abc843872", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76fbcd70dd558af4c2e3f91ce5cf756780cab9c480c9802f92195b0d47e90c2e", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efdb736d758a2264e727855c49dd63b6387ed5a667058ba34673d025060582e4", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d859ad0c8db2c937ad5ab27c50eeca05b45efc32e21bea1a480baa5827e6af2e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ace6a3dd12958acd2735b1e72082f31ac5d8e3c7ea3fb27f53bcdc5c33c88bd", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33b3a5bc8407432c094d00a87d963a0e6c2f3c13486c2ccc6f00a541e74be54d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d6905d8453ae7058beac150f48e10d6ce5e0d663ecbf3339b7d10e858077a3b", "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:6fd13a39bd71ceeafb544804c3af1633ebc34f9ed74e8f18052350f6eac19782", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740881373ce7f749af6648785bb1679d365969b57c2a1da5e7cbae56c7cfd9cd" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96930d5109c682cf1046d7d771413bcfe0a2c73ec2894ff2e85f0f76a9b85f61", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b537bb1dc091f7ef15bf811ab4dbacdf7230547f0b7f55123462ef71a61cf371" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index a75d688337..c28d73a5b6 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-2024-12-15-083313" + "base": "4.17.0-0.nightly-2024-12-18-203600" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e7e1338f858be4af9e978be098dec02a743fd4c31f1c2afd056577dfd524a4", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067b1a862dbf09ef08a9967885b787570361f30ff9d53152171efee282cfca5c", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b6b273cbf83735e9d89175358fc74e1900b8a998df32711c3f14c7717b430d0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:901e992d0e5f69019f9a1c973d8a052b918a063a89f3843e53cea9421f02ff17", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb5b2533d2993fda17be6c67cc70b384b1fd177ce15ee216320f124a5e6d338c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f9c12df3f9cdfbdb81d02a9ef205f3749524c2ec0f3418ed7123f545671836b", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3584fb55375c037e8c6dbc5c1dd7246680ed737ce03a15e38edb61258e3a7853", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:909827b4e48643872c28edda8a82df0383f733d10a2c82517c1ebfb73d93ccf4", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2164d9059b8df17974fbd6513d442adb91987f058d6df2c0025ae160491c986e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac1508e67210a4ef8dc7e5f737d3b14173bda80e6cc217d8e9c07480ef7d1ce3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:903dfe5720c73a092766ade3ac734dad79c224d4616378305bcb7e7fa9287a68", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a8e32596eb5ca9e3774c93633fdeecfef67ce3feee91fa948b910a16898eb0", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:222e8fa29f55863ba0c157ee2ba2f460a82e073229688916c60825a75505cb48", "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:21010baacefd126c9fe2a90142548425c9472176bf0e30e499b7c33438802261", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d0561c241084eaba9ac712f511168a5511cc65ff991ac657d959ae167c161f2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abe67c6a9d6dfa5c22826993e659cfff9dafe43270e629532b98f4f7cda7c679", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46c4dc12ec5fc95735447dec8f7890d03691fb9ea4ecf415d6d60f3c5274dd61" } } From 24d675672fe698b679ee4757a0cf0eb4968dbb2d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 19 Dec 2024 04:28:45 +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 ca87bb9265..69cab301bf 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.6 -KUBE_GIT_COMMIT=df0195cb1143b34da26b6aa490ab812036e77898 +KUBE_GIT_VERSION=v1.30.7 +KUBE_GIT_COMMIT=f868289cea8577c895fa957b466f209b9af6a1a2 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0f93f374d5..e559e21376 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-12-15-102601 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-12-18-233500 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9b70eeb792..90782aed9b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-12-15-083313 +OCP_VERSION := 4.17.0-0.nightly-2024-12-18-203600