From f1ce6c318c39d75654d977a326ac5629a1c89f19 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:16:53 +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 6064e29a5f..d16acc018c 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.14.0-0.nightly-2024-07-02-144817" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-07-02-135137" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-07-04-152929" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-07-04-233618" From 9a4cd33a5488453e399062fc62ba3e287df91c37 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:16:53 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 59 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 12 +++---- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..27217e4873 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,59 @@ +- cluster-dns-operator embedded-component 9964f0b6fce1ba7a26995762602685cd07416928 to 0ea96c98243f4f0afae3331fc3766200a4c038b5 + - 0c14c9e 2024-06-14T01:21:07+00:00 Enable topology-aware hints iff nodes in >=2 zones + +- cluster-ingress-operator embedded-component fe438b86e3241ffdb13e7a4cbac43060949733cc to fe5bd7b02565becfb8ff80aaafbc2215a45ce4c9 + - 5ac3463 2024-07-02T19:21:28+00:00 OCPBUGS-35368: Add Regexp Anchor to TestAll + +- kubernetes embedded-component fedd72e71a4f21582b9ff43d929321f87dd24f7a to 61474561fcb21a751f326887df2d943c00354b16 + - b8dc9d064 2024-07-03T17:24:48+02:00 UPSTREAM: : disable hack/verify-govulncheck.sh in 4.15 + - 65177b243 2024-06-18T16:06:35+00:00 git commit -m "UPSTREAM: : hack/update-vendor.sh, make update and update image" + - fb63712e1 2024-06-11T19:56:00+00:00 Release commit for Kubernetes v1.27.15 + - 7146caef2 2024-06-06T18:36:19+02:00 Bump images, dependencies and versions to go 1.21.11 and distroless iptables + - 3e34da6e2 2024-06-04T11:39:47+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable + - 33deeed90 2024-06-04T11:37:48+00:00 Revert "scheduler: preallocation for NodeToStatusMap" + - 12ee08792 2024-05-22T10:59:07+08:00 add an integration test when nodeAffinity specifies a non-existent node. + - 22f2ba023 2024-05-22T10:59:00+08:00 base on allNodes when calculating nextStartNodeIndex + - e1343e2ff 2024-05-22T00:57:05+05:30 backport verify-govulncheck.sh + - f37ce28c3 2024-05-14T11:17:10+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.14 + - 3ac2d9889 2024-05-14T10:34:43+00:00 Cherry pick #124618 to 1.27 + - d5452392a 2024-05-13T21:37:06-04:00 Fix NFS related issues on GCP/Ubuntu + - 37fb64147 2024-05-12T15:44:11+02:00 [go] Bump images, dependencies and versions to go 1.21.10 and distroless iptables + - 4e06df413 2024-05-11T01:19:52+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year + +- machine-config-operator embedded-component 5f5ce309c545f74888a748123dba0f8afbaccbd4 to 2af8f3ee00669286da10a87a6cabf7c32cb2f3bc + - e832fc05 2024-07-02T12:15:08-04:00 daemon/update: add workaround for OCPBUGS-33694 + - d6df6128 2024-07-02T12:15:08-04:00 daemon/update: disable systemd unit before overwriting + - 5b8763ac 2024-04-19T08:05:49+00:00 OCPBUGS-24366: Delete state files on reboot only + +- kubernetes image-amd64 fedd72e71a4f21582b9ff43d929321f87dd24f7a to 61474561fcb21a751f326887df2d943c00354b16 + - b8dc9d064 2024-07-03T17:24:48+02:00 UPSTREAM: : disable hack/verify-govulncheck.sh in 4.15 + - 65177b243 2024-06-18T16:06:35+00:00 git commit -m "UPSTREAM: : hack/update-vendor.sh, make update and update image" + - fb63712e1 2024-06-11T19:56:00+00:00 Release commit for Kubernetes v1.27.15 + - 7146caef2 2024-06-06T18:36:19+02:00 Bump images, dependencies and versions to go 1.21.11 and distroless iptables + - 3e34da6e2 2024-06-04T11:39:47+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable + - 33deeed90 2024-06-04T11:37:48+00:00 Revert "scheduler: preallocation for NodeToStatusMap" + - 12ee08792 2024-05-22T10:59:07+08:00 add an integration test when nodeAffinity specifies a non-existent node. + - 22f2ba023 2024-05-22T10:59:00+08:00 base on allNodes when calculating nextStartNodeIndex + - e1343e2ff 2024-05-22T00:57:05+05:30 backport verify-govulncheck.sh + - f37ce28c3 2024-05-14T11:17:10+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.14 + - 3ac2d9889 2024-05-14T10:34:43+00:00 Cherry pick #124618 to 1.27 + - d5452392a 2024-05-13T21:37:06-04:00 Fix NFS related issues on GCP/Ubuntu + - 37fb64147 2024-05-12T15:44:11+02:00 [go] Bump images, dependencies and versions to go 1.21.10 and distroless iptables + - 4e06df413 2024-05-11T01:19:52+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year + +- kubernetes image-arm64 fedd72e71a4f21582b9ff43d929321f87dd24f7a to 61474561fcb21a751f326887df2d943c00354b16 + - b8dc9d064 2024-07-03T17:24:48+02:00 UPSTREAM: : disable hack/verify-govulncheck.sh in 4.15 + - 65177b243 2024-06-18T16:06:35+00:00 git commit -m "UPSTREAM: : hack/update-vendor.sh, make update and update image" + - fb63712e1 2024-06-11T19:56:00+00:00 Release commit for Kubernetes v1.27.15 + - 7146caef2 2024-06-06T18:36:19+02:00 Bump images, dependencies and versions to go 1.21.11 and distroless iptables + - 3e34da6e2 2024-06-04T11:39:47+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable + - 33deeed90 2024-06-04T11:37:48+00:00 Revert "scheduler: preallocation for NodeToStatusMap" + - 12ee08792 2024-05-22T10:59:07+08:00 add an integration test when nodeAffinity specifies a non-existent node. + - 22f2ba023 2024-05-22T10:59:00+08:00 base on allNodes when calculating nextStartNodeIndex + - e1343e2ff 2024-05-22T00:57:05+05:30 backport verify-govulncheck.sh + - f37ce28c3 2024-05-14T11:17:10+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.14 + - 3ac2d9889 2024-05-14T10:34:43+00:00 Cherry pick #124618 to 1.27 + - d5452392a 2024-05-13T21:37:06-04:00 Fix NFS related issues on GCP/Ubuntu + - 37fb64147 2024-05-12T15:44:11+02:00 [go] Bump images, dependencies and versions to go 1.21.10 and distroless iptables + - 4e06df413 2024-05-11T01:19:52+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 6634a1a82f..ca44f97f40 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,6 +1,6 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component d4a1162514ecbf248b04e6e8625d17bc2b775ccd -https://github.com/openshift/cluster-dns-operator embedded-component 9964f0b6fce1ba7a26995762602685cd07416928 -https://github.com/openshift/cluster-ingress-operator embedded-component fe438b86e3241ffdb13e7a4cbac43060949733cc +https://github.com/openshift/cluster-dns-operator embedded-component 0ea96c98243f4f0afae3331fc3766200a4c038b5 +https://github.com/openshift/cluster-ingress-operator embedded-component fe5bd7b02565becfb8ff80aaafbc2215a45ce4c9 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4302637f4d521bd9880de93df6bc41d44a4b0756 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4e059638c2cbf003551ee699106dc024760eece3 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 33f630dc1f890ca59c5e57fb5b6cc24a3f22a1d4 @@ -9,9 +9,9 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59 https://github.com/openshift/csi-external-snapshotter embedded-component a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab0348056b50969af9627 -https://github.com/openshift/kubernetes embedded-component fedd72e71a4f21582b9ff43d929321f87dd24f7a +https://github.com/openshift/kubernetes embedded-component 61474561fcb21a751f326887df2d943c00354b16 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb -https://github.com/openshift/machine-config-operator embedded-component 5f5ce309c545f74888a748123dba0f8afbaccbd4 +https://github.com/openshift/machine-config-operator embedded-component 2af8f3ee00669286da10a87a6cabf7c32cb2f3bc https://github.com/openshift/openshift-controller-manager embedded-component 27209ef14fcfca236ddba24ac7289bb3d01be8e6 https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16 https://github.com/openshift/router image-amd64 c3a2430c09ccea623bb8a599ce56a6e267009620 https://github.com/openshift/kube-rbac-proxy image-amd64 1a646b98d8864e53accb726531d86f084ab13977 https://github.com/openshift/ovn-kubernetes image-amd64 bdc67edd064afc3519c4780f43c1c3837cd4143f -https://github.com/openshift/kubernetes image-amd64 fedd72e71a4f21582b9ff43d929321f87dd24f7a +https://github.com/openshift/kubernetes image-amd64 61474561fcb21a751f326887df2d943c00354b16 https://github.com/openshift/service-ca-operator image-amd64 3c3f82f7112ee4b5656e5c554f9887acdf881175 https://github.com/openshift/oc image-arm64 aa6e2f22f0c7e46757d976b6eb003786196ff907 https://github.com/openshift/coredns image-arm64 7d3fa777871ed2e5a70715e7f3e71d3f01785330 @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16 https://github.com/openshift/router image-arm64 c3a2430c09ccea623bb8a599ce56a6e267009620 https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977 https://github.com/openshift/ovn-kubernetes image-arm64 bdc67edd064afc3519c4780f43c1c3837cd4143f -https://github.com/openshift/kubernetes image-arm64 fedd72e71a4f21582b9ff43d929321f87dd24f7a +https://github.com/openshift/kubernetes image-arm64 61474561fcb21a751f326887df2d943c00354b16 https://github.com/openshift/service-ca-operator image-arm64 3c3f82f7112ee4b5656e5c554f9887acdf881175 From b57c0af6bd2ef65d33537bcd552926683aa7e57b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:17:38 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 60 +++++++++++++++++----------------- go.sum | 100 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/go.mod b/go.mod index 82bcec4e2f..ff5147f795 100644 --- a/go.mod +++ b/go.mod @@ -239,36 +239,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240628085228-fedd72e71a4f // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240628085228-fedd72e71a4f // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240703182630-61474561fcb2 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240703182630-61474561fcb2 // from kubernetes ) replace ( diff --git a/go.sum b/go.sum index 79c4fa6302..28d3ce82e5 100644 --- a/go.sum +++ b/go.sum @@ -533,58 +533,58 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:CSoRU2XPMMRziq/pDD3H9pJA5ZJS+KkpaoRLzAxmvak= github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/kubernetes v0.0.0-20240628085228-fedd72e71a4f h1:KfZYQDABKjhtkqpe6t06XXO1Lm5A/Ucfnr5fLUOrulU= -github.com/openshift/kubernetes v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:lGAQJVZaMzHt9tzwp2oMDSf/W6k0w7AUS3jG2EM1Ing= +github.com/openshift/kubernetes v0.0.0-20240703182630-61474561fcb2 h1:kC3zA5XIYbcbkVPmz9IMLFHQFotb/AQRMj+4ThgNIls= +github.com/openshift/kubernetes v0.0.0-20240703182630-61474561fcb2/go.mod h1:lGAQJVZaMzHt9tzwp2oMDSf/W6k0w7AUS3jG2EM1Ing= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 h1:gjPs80PVnSOjK7oBizuGNphNNYBdaevQBw0EvQ5/fsQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f h1:lkfxzDUJ+SsXoztWW869ZibRZv2Dw4MZyErjoELYQKo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f h1:Fas2V7/L0WpQIBSYaECW4VT2KhKTGp8T7zymQBzXHoM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:XSiSLWMg02kHhzubtLfVamHGGdyqOtiL/90amV9lbts= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f h1:GbUuCUUKAJoVjMaw1/vvqWM2L9Cd5jxZHVen5GuQMSE= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:11FL8gdHsruUo5kfVS4KSnm1ttRFMZy68/zQ5FLO9NE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f h1:Xk3tcPsDAo2TlHn+gC5FZ4jQrMYD7l8MhpI5iC6zDfc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:NI2qwAKW+o3g3G/x4Mj9Fjks/fYb+s0aNQ4uFQg4YNY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f h1:QJvkwkolhxSB9/TsGBY+miGLqUPFv//16onocK61Ops= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:YNjpOzRbhstgdVRBCmYJ3oBD0tvZYHGINpyQMVCT0/M= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f h1:0yNxr+Wf7dHtVlOYzpCeqpDeJ2ytcYsD7XcZroML3jo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:ngacXN4rIIbmZljfUTrprO0jzflhYL87X8je4WY6xP4= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f h1:BMScM4iqQyFc1pVLVBcWAljl7IhbwGqJRxVdJMcHymU= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:mgHibPt4ktUZ403/FLtdtQauGWCMoYpnCN0z5tQyG2U= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f h1:w17kfZBFHLHE2/rjaO2yPNC2kKkLNZH7lwpHxqZPSd8= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:DeKNT6f/LNMZPdj9kI9UrH58Qa5XsXrBm+ZD0uF55UU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f h1:tM509S2QC7I1Nsrp+jzhiJ3tvww/xfDiFi8jcjvLKuY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:Hu4xHKbQIQ+iP96FKcXfV6pLwf328wMBt2oNVcetX70= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f h1:Dk+WsHoR7Oaa4Znp52VSzQYkEdUEoSpDjhp95xYrZy8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:BHJekq+jZXjWnfVkQHar03KxK8DZnyFHMzRND5wJCM0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f h1:hW2adKXaYZmTgdHX16nJqjT/5EUK0WnECA46IMw5DkY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:8UKo2S7SaOWOxQtwOk1qMDNlcmru4FI0sDDrkz+IA80= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f h1:PwdmC8Sdi5rC7YacAGU8RCXawr/op8tlEiAG2U0DRzA= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:DbSylUnPB4SpjJ/VETmh+zdAWCTZy9cUPKelUdJ5gpQ= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f h1:6V/M/DZKUbPJpYVd15bn5WTwMS4eU5Wdi7+5Lso6dCE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:DyLOnDaHb8Qk3yxEAKJXDIe6Bxm/JFsJ2v0e03eqDs4= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f h1:RfphU0H7A02dXej6DiAxdY+QyTtcdDDSnnctHptOukg= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:oIRC4D8bhPIFlzpfSxjkrMKYf9XDhlqz03vX59FM7/w= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f h1:7YvH4xMQp0rm1sbw5W/+GERnC/HdW0wa/P1Hm8hShtU= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:qYGTHfkh3IOK0nq8YrkIseE/c+5ZPHO9PjtxXyrVXfo= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f h1:wn7c6EFVkZl1VlWvVqiRDqqlEU/2LiGXAB6cDAfO8is= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:PYPlv2uF1IDLodMU17OnPwTOMO4ShaimQX1bjiPa10E= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f h1:PpxEuNriSfdVSP2hz5XwO228G3lcLn7YS3aOmA6GJ8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:dLweBBZUIPmUAcRfhHeQjphkMo5LcsJ48zy3rWp1KpI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f h1:2kVM+JrZeJyBE4cTzbIifrshW8WPiasWz8A9ZimP7UI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:qBD1IN6eA35KNDtwqbglJ6+GfLoA9LOC2/BOrjIY3/Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f h1:7O9YESWV+SGHo+G1czbnMu8rMpoCMn0WZ/bwW4kyv3k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:ck7xqY/Sk5bjq7R4T7ifAwDaz29fxMl08JWBTaIZqzA= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f h1:BdN8qLmGjZDHQY0HOo8p6tpVdOxrpbXqvtKg/WCAXZ0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:MalWQsYtXY83L05kh3Vez8bWlF+/t0z5AjnSQLuwjRs= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f h1:MSKxDs0W+o+C7O7p+V22b2r0vfKudmsFQnXQrVoEJns= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:ifuMlD6gtCtIZo5nNejHB7TOR5ra67Ypc4ymw/WeECg= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f h1:78pu/0qaDCLNc14VvD4EFozcbbf22PqbA5rlGM+Dr5Q= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:SWasV40ck8mkHUZfsIgaQhXNTkC203BKyMS/AkFTDM4= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f h1:D9mftMOY2V4tZDs6+XtnX8fn+JDZBSyagivKOZVdnZw= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:75UwQYln2hdyE2Qld6dRU3wYB8falp9bAtlg8Z92RY8= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f h1:FSadC7QsVsTT59697hBQH6oy2Ykk6RnpKzK5IjckTI4= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:bVceox0gthdUp31Yx+rfoKHI98L07dTJzDTZzCRp9yU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 h1:PqW8Q0X4CkGWT12dYJ5f4zD0kr2bRqGxxnFTzpRXSBg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 h1:ho5kpn8CtKRhe+mJh0xxkNVxKrY5+TGEezLFwJ/lChk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2/go.mod h1:XSiSLWMg02kHhzubtLfVamHGGdyqOtiL/90amV9lbts= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 h1:bwaBgtAxlHkCqghsXuiWk9/KWCcsQ6clRzStjXKgGnI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2/go.mod h1:11FL8gdHsruUo5kfVS4KSnm1ttRFMZy68/zQ5FLO9NE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 h1:VwgFgXCB5EI+aip/rC86S0aRC3q0+8tBHwQ1LrB72UQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2/go.mod h1:NI2qwAKW+o3g3G/x4Mj9Fjks/fYb+s0aNQ4uFQg4YNY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 h1:ZaDHN3F4DC9eK+S6/GSUdw7Flc1FgCb9+isUsBMaoFU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2/go.mod h1:YNjpOzRbhstgdVRBCmYJ3oBD0tvZYHGINpyQMVCT0/M= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 h1:aVrxggRTszEdax/hV0RPSu1Ii4s8AqHGUYg9K/Xz5/0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2/go.mod h1:ngacXN4rIIbmZljfUTrprO0jzflhYL87X8je4WY6xP4= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 h1:TnKMWhZCJbQSAyMrXd7bow5KKLhT3fCG7Uaj37zXYfw= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2/go.mod h1:mgHibPt4ktUZ403/FLtdtQauGWCMoYpnCN0z5tQyG2U= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 h1:JLQxT5uFZBWn7ojrMOeWdFGSejSHqjGPkux7odglAMo= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2/go.mod h1:DeKNT6f/LNMZPdj9kI9UrH58Qa5XsXrBm+ZD0uF55UU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 h1:vqaHHg4nyFJbsX+D033pQSb4WgM58orOBS/cGhvoW8U= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2/go.mod h1:Hu4xHKbQIQ+iP96FKcXfV6pLwf328wMBt2oNVcetX70= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 h1:uw4RvHlmoBB7hsyRqdCU8oZhq9GvHHeBCn27SOZ2oA8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2/go.mod h1:BHJekq+jZXjWnfVkQHar03KxK8DZnyFHMzRND5wJCM0= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 h1:E12blVXvUeu6BEbAd1PCoJZmKMalu9soZAeJ4FjU+wE= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2/go.mod h1:8UKo2S7SaOWOxQtwOk1qMDNlcmru4FI0sDDrkz+IA80= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 h1:sXslTuJLpH+LCS/PaORPkyBcdQbyVjXpcXhxj19moUE= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2/go.mod h1:DbSylUnPB4SpjJ/VETmh+zdAWCTZy9cUPKelUdJ5gpQ= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 h1:UgWAo5XRXtt+KDepJRy1/3Ri4I2QJgmygS81ATCqxLY= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2/go.mod h1:DyLOnDaHb8Qk3yxEAKJXDIe6Bxm/JFsJ2v0e03eqDs4= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 h1:1qFpFx9KVskl8CjF9xUm9P2ZErBiGBrVBW3EuT3hT+U= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2/go.mod h1:oIRC4D8bhPIFlzpfSxjkrMKYf9XDhlqz03vX59FM7/w= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 h1:SeDroyFMfONlSX4dO5Z08cBxh5MMB+S5ocYh7y+ETx4= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2/go.mod h1:qYGTHfkh3IOK0nq8YrkIseE/c+5ZPHO9PjtxXyrVXfo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 h1:wjIOXnW4tox+na15gqm+EQQA8X/rrkmjc9vv1ZAzcGU= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2/go.mod h1:PYPlv2uF1IDLodMU17OnPwTOMO4ShaimQX1bjiPa10E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 h1:/mYAUQBeH0QZu+sm7UfW9oluIvpYjSM9GXnObXGCVBk= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2/go.mod h1:dLweBBZUIPmUAcRfhHeQjphkMo5LcsJ48zy3rWp1KpI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 h1:4M1hzrcUoThl/42T8uxhs7mpWzXSfjUSrYEAWJOSJjw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2/go.mod h1:qBD1IN6eA35KNDtwqbglJ6+GfLoA9LOC2/BOrjIY3/Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 h1:W7NtfpuQ3k1cbF+6ojoM3VVSqh+zcZ8rWN9ZhNRthcQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2/go.mod h1:ck7xqY/Sk5bjq7R4T7ifAwDaz29fxMl08JWBTaIZqzA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 h1:pNqhjDLhzYOgJpH0gKCimoBb/Tl4BUqTpsTZ/mPmxs0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2/go.mod h1:MalWQsYtXY83L05kh3Vez8bWlF+/t0z5AjnSQLuwjRs= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 h1:8Nul7LX7LHmgwxun/GvU7K6JGnsp3f6WpHaPSeIfakw= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2/go.mod h1:ifuMlD6gtCtIZo5nNejHB7TOR5ra67Ypc4ymw/WeECg= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 h1:d2y29b/W+oKDh1IyGwwXZqxzVdfGOewBM1PBiwILS8k= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2/go.mod h1:SWasV40ck8mkHUZfsIgaQhXNTkC203BKyMS/AkFTDM4= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 h1:x0yXuI1Z4QO9+/zbYRnNp0CmsWplPgQFO5oG+QvLDTs= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2/go.mod h1:75UwQYln2hdyE2Qld6dRU3wYB8falp9bAtlg8Z92RY8= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 h1:Rb59hGg5pjc+yCjx9rDRRVlPwbysEBpHrvHRwnbA/9s= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2/go.mod h1:bVceox0gthdUp31Yx+rfoKHI98L07dTJzDTZzCRp9yU= github.com/openshift/library-go v0.0.0-20231030114140-33085da695c8 h1:mHH2dYxSr6EB/UrAOUwvuGJPZ/cay0lhDaPB3Nplbhw= github.com/openshift/library-go v0.0.0-20231030114140-33085da695c8/go.mod h1:ZFwNwC3opc/7aOvzUbU95zp33Lbxet48h80ryH3p6DY= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= From 2906ab1bf77697a434fde5ba1f999991f2a1fec1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:12 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../pkg/scheduler/framework/interface.go | 5 +- .../framework/preemption/preemption.go | 17 +-- .../pkg/scheduler/framework/types.go | 3 + .../internal/queue/scheduling_queue.go | 5 + .../kubernetes/pkg/scheduler/schedule_one.go | 29 ++--- vendor/modules.txt | 110 +++++++++--------- 6 files changed, 89 insertions(+), 80 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go index 374efa16ee..5ad501bbdc 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go @@ -48,7 +48,8 @@ type NodeScore struct { Score int64 } -// NodeToStatusMap declares map from node name to its status. +// NodeToStatusMap contains the statuses of the Nodes where the incoming Pod was not schedulable. +// A PostFilter plugin that uses this map should interpret absent Nodes as UnschedulableAndUnresolvable. type NodeToStatusMap map[string]*Status // NodePluginScores is a struct with node name and scores for that node. @@ -391,6 +392,8 @@ type FilterPlugin interface { type PostFilterPlugin interface { Plugin // PostFilter is called by the scheduling framework. + // If there is no entry in the NodeToStatus map, its implicit status is UnschedulableAndUnresolvable. + // // A PostFilter plugin should return one of the following statuses: // - Unschedulable: the plugin gets executed successfully but the pod cannot be made schedulable. // - Success: the plugin gets executed successfully and the pod can be made schedulable. diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go index fcd12774c1..00d7cf2ba8 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go @@ -404,15 +404,18 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1. func nodesWherePreemptionMightHelp(nodes []*framework.NodeInfo, m framework.NodeToStatusMap) ([]*framework.NodeInfo, framework.NodeToStatusMap) { var potentialNodes []*framework.NodeInfo nodeStatuses := make(framework.NodeToStatusMap) + unresolvableStatus := framework.NewStatus(framework.UnschedulableAndUnresolvable, "Preemption is not helpful for scheduling") for _, node := range nodes { - name := node.Node().Name - // We rely on the status by each plugin - 'Unschedulable' or 'UnschedulableAndUnresolvable' - // to determine whether preemption may help or not on the node. - if m[name].Code() == framework.UnschedulableAndUnresolvable { - nodeStatuses[node.Node().Name] = framework.NewStatus(framework.UnschedulableAndUnresolvable, "Preemption is not helpful for scheduling") - continue + nodeName := node.Node().Name + // We only attempt preemption on nodes with status 'Unschedulable'. For + // diagnostic purposes, we propagate UnschedulableAndUnresolvable if either + // implied by absence in map or explicitly set. + status, ok := m[nodeName] + if status.Code() == framework.Unschedulable { + potentialNodes = append(potentialNodes, node) + } else if !ok || status.Code() == framework.UnschedulableAndUnresolvable { + nodeStatuses[nodeName] = unresolvableStatus } - potentialNodes = append(potentialNodes, node) } return potentialNodes, nodeStatuses } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go index 4b5337c21e..f98b6084a5 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go @@ -222,6 +222,9 @@ const ExtenderName = "Extender" // Diagnosis records the details to diagnose a scheduling failure. type Diagnosis struct { + // NodeToStatusMap records the status of each retriable node (status Unschedulable) + // While this map may contain UnschedulableAndUnresolvable statuses, the absence of + // a node should be interpreted as UnschedulableAndUnresolvable. NodeToStatusMap NodeToStatusMap UnschedulablePlugins sets.String // PreFilterMsg records the messages returned from PreFilter plugins. diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go index 8f66833309..27a67c10d3 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go @@ -776,6 +776,11 @@ func (p *PriorityQueue) MoveAllToActiveOrBackoffQueue(event framework.ClusterEve func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework.QueuedPodInfo, event framework.ClusterEvent) { activated := false for _, pInfo := range podInfoList { + // Since there may be many gated pods and they will not move from the + // unschedulable pool, we skip calling the expensive isPodWorthRequeueing. + if pInfo.Gated { + continue + } // If the event doesn't help making the Pod schedulable, continue. // Note: we don't run the check if pInfo.UnschedulablePlugins is nil, which denotes // either there is some abnormal error, or scheduling the pod failed by plugins other than PreFilter, Filter and Permit. diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go b/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go index 974f82b02f..37809fb5da 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go @@ -386,18 +386,15 @@ func (sched *Scheduler) schedulePod(ctx context.Context, fwk framework.Framework // Filters the nodes to find the ones that fit the pod based on the framework // filter plugins and filter extenders. func (sched *Scheduler) findNodesThatFitPod(ctx context.Context, fwk framework.Framework, state *framework.CycleState, pod *v1.Pod) ([]*v1.Node, framework.Diagnosis, error) { - allNodes, err := sched.nodeInfoSnapshot.NodeInfos().List() - if err != nil { - return nil, framework.Diagnosis{ - NodeToStatusMap: make(framework.NodeToStatusMap), - UnschedulablePlugins: sets.NewString(), - }, err - } - diagnosis := framework.Diagnosis{ - NodeToStatusMap: make(framework.NodeToStatusMap, len(allNodes)), + NodeToStatusMap: make(framework.NodeToStatusMap), UnschedulablePlugins: sets.NewString(), } + + allNodes, err := sched.nodeInfoSnapshot.NodeInfos().List() + if err != nil { + return nil, diagnosis, err + } // Run "prefilter" plugins. preRes, s := fwk.RunPreFilterPlugins(ctx, state, pod) if !s.IsSuccess() { @@ -437,21 +434,19 @@ func (sched *Scheduler) findNodesThatFitPod(ctx context.Context, fwk framework.F nodes := allNodes if !preRes.AllNodes() { nodes = make([]*framework.NodeInfo, 0, len(preRes.NodeNames)) - for _, n := range allNodes { - if !preRes.NodeNames.Has(n.Node().Name) { - // We consider Nodes that are filtered out by PreFilterResult as rejected via UnschedulableAndUnresolvable. - // We have to record them in NodeToStatusMap so that they won't be considered as candidates in the preemption. - diagnosis.NodeToStatusMap[n.Node().Name] = framework.NewStatus(framework.UnschedulableAndUnresolvable, "node is filtered out by the prefilter result") - continue + for nodeName := range preRes.NodeNames { + // PreRes may return nodeName(s) which do not exist; we verify + // node exists in the Snapshot. + if nodeInfo, err := sched.nodeInfoSnapshot.Get(nodeName); err == nil { + nodes = append(nodes, nodeInfo) } - nodes = append(nodes, n) } } feasibleNodes, err := sched.findNodesThatPassFilters(ctx, fwk, state, pod, diagnosis, nodes) // always try to update the sched.nextStartNodeIndex regardless of whether an error has occurred // this is helpful to make sure that all the nodes have a chance to be searched processedNodes := len(feasibleNodes) + len(diagnosis.NodeToStatusMap) - sched.nextStartNodeIndex = (sched.nextStartNodeIndex + processedNodes) % len(nodes) + sched.nextStartNodeIndex = (sched.nextStartNodeIndex + processedNodes) % len(allNodes) if err != nil { return nil, diagnosis, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ba8771f7f..c58afaa72f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1333,7 +1333,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1390,7 +1390,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/apiextensions-apiserver v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1436,7 +1436,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.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1501,7 +1501,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.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/apiserver v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1660,12 +1660,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2002,7 +2002,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.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/cloud-provider v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2024,14 +2024,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-20240628085228-fedd72e71a4f +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2065,7 +2065,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.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/component-helpers v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2078,7 +2078,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.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/controller-manager v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2095,16 +2095,16 @@ 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-20240628085228-fedd72e71a4f +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220913193501-391367153a38 @@ -2123,13 +2123,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/kms v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/kube-aggregator v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2160,7 +2160,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-20240628085228-fedd72e71a4f +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -2193,13 +2193,13 @@ 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-20240628085228-fedd72e71a4f +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2234,7 +2234,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.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/kubelet v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2251,7 +2251,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.27.7 => github.com/openshift/kubernetes v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/kubernetes v1.27.7 => github.com/openshift/kubernetes v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3053,7 +3053,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3095,7 +3095,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3110,10 +3110,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-20240628085228-fedd72e71a4f +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/pod-security-admission v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3263,36 +3263,36 @@ 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.20230317131656-c62d9de5a460 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240703182630-61474561fcb2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240703182630-61474561fcb2 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240703182630-61474561fcb2 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 From 0477f893591b47dfb8ec19a2d8c018a7f5046703 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:12 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 58 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 24 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index c403a3fa16..909824a151 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,33 +144,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240628085228-fedd72e71a4f // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240703182630-61474561fcb2 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240703182630-61474561fcb2 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index 403d804901..8fcd24d3f1 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -296,18 +296,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:6aC0BK github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:wIeFyS+hpjk/YD2TxKVeW5XqfoGix50aeNM+RnV6PoQ= github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f h1:lkfxzDUJ+SsXoztWW869ZibRZv2Dw4MZyErjoELYQKo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f h1:GbUuCUUKAJoVjMaw1/vvqWM2L9Cd5jxZHVen5GuQMSE= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:11FL8gdHsruUo5kfVS4KSnm1ttRFMZy68/zQ5FLO9NE= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f h1:QJvkwkolhxSB9/TsGBY+miGLqUPFv//16onocK61Ops= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:YNjpOzRbhstgdVRBCmYJ3oBD0tvZYHGINpyQMVCT0/M= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f h1:0yNxr+Wf7dHtVlOYzpCeqpDeJ2ytcYsD7XcZroML3jo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:ngacXN4rIIbmZljfUTrprO0jzflhYL87X8je4WY6xP4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f h1:tM509S2QC7I1Nsrp+jzhiJ3tvww/xfDiFi8jcjvLKuY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:Hu4xHKbQIQ+iP96FKcXfV6pLwf328wMBt2oNVcetX70= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f h1:7O9YESWV+SGHo+G1czbnMu8rMpoCMn0WZ/bwW4kyv3k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f/go.mod h1:ck7xqY/Sk5bjq7R4T7ifAwDaz29fxMl08JWBTaIZqzA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 h1:PqW8Q0X4CkGWT12dYJ5f4zD0kr2bRqGxxnFTzpRXSBg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 h1:bwaBgtAxlHkCqghsXuiWk9/KWCcsQ6clRzStjXKgGnI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2/go.mod h1:11FL8gdHsruUo5kfVS4KSnm1ttRFMZy68/zQ5FLO9NE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 h1:ZaDHN3F4DC9eK+S6/GSUdw7Flc1FgCb9+isUsBMaoFU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2/go.mod h1:YNjpOzRbhstgdVRBCmYJ3oBD0tvZYHGINpyQMVCT0/M= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 h1:aVrxggRTszEdax/hV0RPSu1Ii4s8AqHGUYg9K/Xz5/0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2/go.mod h1:ngacXN4rIIbmZljfUTrprO0jzflhYL87X8je4WY6xP4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 h1:vqaHHg4nyFJbsX+D033pQSb4WgM58orOBS/cGhvoW8U= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2/go.mod h1:Hu4xHKbQIQ+iP96FKcXfV6pLwf328wMBt2oNVcetX70= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 h1:W7NtfpuQ3k1cbF+6ojoM3VVSqh+zcZ8rWN9ZhNRthcQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2/go.mod h1:ck7xqY/Sk5bjq7R4T7ifAwDaz29fxMl08JWBTaIZqzA= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= From ea79fe184adac64d212cb9c7cbb24ea04fca0627 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:18 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index a45be01508..5229abb277 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -595,7 +595,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -652,7 +652,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -703,12 +703,12 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -854,7 +854,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.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -891,7 +891,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-20240628085228-fedd72e71a4f +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1019,32 +1019,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240628085228-fedd72e71a4f -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240628085228-fedd72e71a4f +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240703182630-61474561fcb2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240703182630-61474561fcb2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240703182630-61474561fcb2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240703182630-61474561fcb2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240703182630-61474561fcb2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240703182630-61474561fcb2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240703182630-61474561fcb2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240703182630-61474561fcb2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240703182630-61474561fcb2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240703182630-61474561fcb2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240703182630-61474561fcb2 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240703182630-61474561fcb2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240703182630-61474561fcb2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240703182630-61474561fcb2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240703182630-61474561fcb2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240703182630-61474561fcb2 From 6efb55e7137eb9730416ed492693a99a9f09fb6f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:18 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index d0b308a590..857081502a 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c6baa15aeb08a9579c765849f355598f6daa3dbc2480ef84f9e186e1caacdf1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d33d1cf7c0334e9b698c15d1ddd402e6b774dcf607e5c233bfc7b43406e5b1be" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index a3bbd7bcb0..828e1ff2d9 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1ae0d92f4166027217512056588c9844f03044967dee72aeb91b8d873cca2e1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83477b34e99c4d260c176068c56bd37adf5008bae6194e9044eda5256d3b6b12" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From ad831fcfe724c7aa3f4b0a4aff8c68b01f89b826 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:19 +0000 Subject: [PATCH 8/9] update manifests --- assets/release/release-aarch64.json | 20 ++++++++++---------- assets/release/release-x86_64.json | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 39ef1b4f50..78b5073eb6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-07-02-135137" + "base": "4.14.0-0.nightly-arm64-2024-07-04-233618" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b20a31a8a6fdea0a0167e1f634f8ba8b89e0229104833f97769e68fae7302e2b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68d16c8fa0c24808768aa9afc2730e3eaec29b8440259c105c0423928812a6ca", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d74e3fdee0305c2054fe648c9e2802513f4c834adb298b33fecf9ac62d2a8f69", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa244ddd49b6777374bdf6587beb40e14c0e9c3fbff0aff4fc179647e301ea01", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83613c6c229cb5650307efbe06b3f476d2071fe0c5cfe2286b92c9cb80dc1d33", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54b3bd2faaeb4118911301628b524e5879edf498a58240858084a33b53a8e530", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f950df71242970510f90c79917b42b18ab365b99c4e0820d1c0700709391f6e9", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dadf7be0324c596bbeb43a8989113de771bd2a36b375dce7f070f02603890f1b", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eafc709d99d1d1c9c144292eeae36ebc371973312f52945536f100e6ba78e9e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1ae0d92f4166027217512056588c9844f03044967dee72aeb91b8d873cca2e1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c0d0a5d0048a4b0e43e4d5a741fc010cad2d6c59f506bc0df02bcff374624ad", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83477b34e99c4d260c176068c56bd37adf5008bae6194e9044eda5256d3b6b12", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb939c0c1a516f0b10c3f286f0e5e0b928c502903d67c4499adc08edc753021d", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d4846ada74d068ce1cb887642119ebb83488941a8dcc463c80fad75f9d3ec40", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52958d285484bf61b96dd4c7d510bf4b8b22b06306c2c98f150a7ff5303edda", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:775fcbf4ea0c27f336c15f1d248477a3c9daf8c1c733885af4ab4c27bafbb31e" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0e5f1797eb3aad1fa7a9091dd2203d4b89597a5ee2a9b1e77661a59360d169d", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ea81b81f679d0e2faefdc03e20290d5dcd9c2c048daddfee13460c842dc24b", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8902f3763653d9c67a78899a40091e6a57cf79a1820b77ac41ea5002c74b4285" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d1857354aa..d8cd153c4c 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-2024-07-02-144817" + "base": "4.14.0-0.nightly-2024-07-04-152929" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:753702bc897796e652e90cec60272aef94d3c23c423ff9fefe09978f27324206", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2040432a93d8129b8602a8aab70f48ab55ae5d65459a3c4c0c8751b2f3db483", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7152be3b863098abe8901e81b0bc20f22a5d0f1907b949017f400d21afbaf646", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0efab895818e0ca11206e5d174596b5106377e01c3bd42cc479c3c88ce7fccaf", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e38deab6457117c0d9423b3b16ef3dd3c4bdb4612ed2494269ef24038bd82b67", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72f1dfdef97d43e25ec4d1e500886de79f063636529f19e07ac7bc056992534d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f4e4c7289580084ed6b963c8ded6840b215eff9ad6b9414e6a24745724020d8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2944ff508d44c320977c58f693dc331dfdb0fa7c79175e25ee93803a59fc104b", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7a4163bfc952ce4a9d708c439de8ae0f3d94902137a9271f00b8b5521116386", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c6baa15aeb08a9579c765849f355598f6daa3dbc2480ef84f9e186e1caacdf1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acfce6b20caec85e38522ad5da9556019f9733ce26808111bfbff84e390ff33c", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d33d1cf7c0334e9b698c15d1ddd402e6b774dcf607e5c233bfc7b43406e5b1be", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2989add59587a9ccefa7363a5f205f0e61ce4965d069cf02f65c3014ef0470f8", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd9b45c616d02dc1c9b9b2ccb449058c754b8bc45583457fa33bf72aeff13075", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d834d6d3b54bdbcadbadd20267274b5d625ec24eeb585c6e91c4fe4de538e4d", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117115317031f9ee7e345e151da73520c2817b89c207e87303a03d3a809f19f7" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cbb139a9fcdac73a959e1e58494b040b7df46bda4b1cc415876b42956c36b4c", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8ee564e6ad1ef6f1ad224a765491880e62713e1037b09b45e08f98042425abf", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a1b239e35ceccf6b74f2f37dc88a70c4d9ac61b286d6920c8ec4fe580288910" } } From 05b2605b926b91fc17495be7e3b82434b3ecbc08 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:18:21 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 4 ++-- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 22bf2d4fbf..8d3fd4ac73 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=27 -KUBE_GIT_VERSION=v1.27.14 -KUBE_GIT_COMMIT=fedd72e71a4f21582b9ff43d929321f87dd24f7a +KUBE_GIT_VERSION=v1.27.15 +KUBE_GIT_COMMIT=61474561fcb21a751f326887df2d943c00354b16 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 5245f362ff..8f7d2ed805 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-07-02-135137 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-07-04-233618 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 46842f0613..556cbeff37 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-07-02-144817 +OCP_VERSION := 4.14.0-0.nightly-2024-07-04-152929