From 275edb1f7f3822a6c7d5c8dac379393296e4eb40 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:25:33 +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 67710df1fb..b7bee36027 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.18.0-0.nightly-2024-09-23-182657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-09-27-000855" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-09-29-150556" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-09-29-233859" From fe2ff59aa39d45231f3affe30b21b84b3e9e7f3c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:25:34 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 99 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 26 ++++---- 2 files changed, 112 insertions(+), 13 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..f1e0a39da5 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,99 @@ +- api embedded-component 2669d1ebc91092ec32e77b1d3f503b11f759b855 to f89ab92f1597eaed4de5b947c1781adde2bf42fb + - 1a74abd 2024-09-26T12:23:59-04:00 Revert "Merge pull request #2037 from deads2k/no-empty-conditions" + - 32bea81 2024-09-25T11:53:03-04:00 generated + - 36a4a2f 2024-09-25T11:53:03-04:00 align the easy lowlevel operator condition validation to metav1.Condition + - e6ca719 2024-09-24T17:18:02+02:00 go mod vendor + - a548e5e 2024-09-24T17:17:33+02:00 update NoNewRequiredFields comparator and bring additional comparators + - a2c8c52 2024-09-23T16:42:30-04:00 generated + - b4969bd 2024-09-23T16:42:30-04:00 add validation to latest revision and generify to operatorstatus + +- cluster-ingress-operator embedded-component b67185f557fceab56fc27d0fde5f6aca3f96e30c to 382e2ba9256c536215a15a9244ba1630e2caf35d + - d03c0f5 2024-09-24T11:28:09-04:00 Set the MI client ID for the ARO HCP override + +- cluster-kube-apiserver-operator embedded-component 9fb047aaed45a81bf817233dde0ca09c8d38e257 to 48d9579a5c4d0f6eb9ddbbc96cb44ccda121ce09 + - 772553c 2024-09-24T18:53:53-03:00 Update the dynamic operator client creation + - 33aee21 2024-09-24T18:50:39-03:00 Bump api, client-go and library-go + +- cluster-kube-controller-manager-operator embedded-component a7e2a74001f3fe7e6be577b2ddef85c3d126a52c to cd996bd0fb68227bfd38caf9e0dc5b6a8561c9bb + - 061fd41 2024-09-24T18:49:07-03:00 Update the dynamic operator client creation + - 01e310b 2024-09-24T18:49:07-03:00 Remove references to RotatedSigningCASecret.UseSecretUpdateOnly var + - d47fcb4 2024-09-24T18:49:07-03:00 Remove reference to ExternalCloudProviderFeature from library-go + - b849fd7 2024-09-24T18:49:07-03:00 Bump api, client-go and library-go + - 8399aca 2024-09-23T18:42:10+02:00 use external cloud provider (ExternalLoops) + +- cluster-kube-scheduler-operator embedded-component bced8cd6e60108d590dfb1f4aa80d4c718f0b3c6 to e48e04e19b8aaaf1bca99f7a1de89de0ea2690f1 + - f71d8a0 2024-09-24T18:56:14-03:00 Update the dynamic operator client creation + - cc58936 2024-09-24T18:55:13-03:00 Bump api, client-go and library-go + +- etcd embedded-component d3e76939ade21ec3080e53c2cf83b3aac15f5119 to b3e8498241c28ab67659cb3547694f5267b18836 + - de65fba9 2024-09-26T15:13:05+02:00 NO-JIRA: use golang 1.22 image + - 9ed8ebd9 2024-09-16T17:22:58+02:00 DOWNSTREAM: : ETCD-656: Automate datadir move after quorum-restore + +- kubernetes embedded-component ce117ff87249deb45bf9564d976255645e530105 to 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 + - d656b56da 2024-09-24T11:26:17-04:00 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch + +- machine-config-operator embedded-component a6ee4b40c68c3d1c89748f7519886a0e27444685 to 56346ad6c09bb86d6e4b09850dde24b076d101d9 + - 2548835e 2024-09-26T12:42:46+05:30 Add a condition in the config node object + - 807d82ff 2024-09-25T13:34:19-04:00 openstack: relax openstack-kubelet-nodename systemd dependency + - e9877d95 2024-09-23T13:09:24+03:00 kubelet-service: provide path to restorecon command + - a191ea57 2024-09-23T10:44:36+02:00 OCPBUGS-38012: Do not use 'restart' for 'oneshot' service + - 39e86d8b 2024-09-16T18:34:37-04:00 render_controller: If renderedMC currently in use by MCP gets deleted, regenerate it without reconciling, since its duplicated in MCD update function + - d260da67 2024-09-16T11:21:27-04:00 sync: Add ValidationAdmissionPolicy and its bindings to mandate a worker label in the MachineConfigSelector of a custom MCP + - 861c0296 2024-09-09T13:39:32-05:00 checks for associated mosb and invokes postbuildcleanup + - 07db49e4 2024-08-29T16:10:00-04:00 allow layered nodes to revert to non-layered + +- openshift-controller-manager embedded-component c8b7e50875be58338892cf5ebcbc55cad822857a to 979e5c9866d7a674a1cf845b0c84707f7af76616 + - df3fa23 2024-09-19T12:28:26-04:00 de-dup registry urls + +- operator-framework-olm embedded-component 8dac17a7feed9532363be139d83c0f98200f830a to fccb629eb860057467a9287b23f5f8d2295aead9 + - d6ce3b5a 2024-09-26T00:12:01+00:00 Bump kubernetes libraries to v0.31.0 and controller-runtime to v0.19.0 (#357) + - 6037af92 2024-09-26T00:11:04+00:00 Bump sigs.k8s.io/controller-runtime from 0.18.4 to 0.18.5 (#356) + - 3b235894 2024-09-26T00:10:52+00:00 Bump k8s.io/apiextensions-apiserver from 0.30.2 to 0.30.3 (#353) + - 9ed34b68 2024-09-26T00:10:38+00:00 Fix codecov-action params (#349) + - 79285bf6 2024-09-26T00:10:27+00:00 Bump github.com/spf13/cobra from 1.8.0 to 1.8.1 + - 9fa554f9 2024-09-26T00:10:13+00:00 Bump k8s.io/apiextensions-apiserver from 0.30.1 to 0.30.2 + - d73d0a78 2024-09-26T00:10:00+00:00 Fix some typos in cel.go (#343) + - ecd95e7e 2024-09-26T00:09:45+00:00 Bump golang.org/x/net from 0.28.0 to 0.29.0 (#1442) + - 34d2eceb 2024-09-26T00:09:31+00:00 Bump golang.org/x/sys from 0.24.0 to 0.25.0 (#1440) + - 9efdec48 2024-09-26T00:09:18+00:00 Bump github.com/mattn/go-sqlite3 from 1.14.22 to 1.14.23 (#1441) + - 4c9c8c3e 2024-09-26T00:09:05+00:00 Bump golang.org/x/mod from 0.20.0 to 0.21.0 (#1439) + - 383583fa 2024-09-26T00:08:52+00:00 Bump golang.org/x/text from 0.17.0 to 0.18.0 (#1438) + - 641e330e 2024-09-26T00:08:39+00:00 pkg/cache: configurable backend preference (#1424) + - 9daaf6e9 2024-09-26T00:08:26+00:00 Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.31 to 0.4.32 (#1428) + - eb631717 2024-09-26T00:08:13+00:00 Bump google.golang.org/grpc from 1.65.0 to 1.66.0 (#1436) + - 5922a88b 2024-09-26T00:07:59+00:00 Bump github.com/onsi/gomega from 1.34.1 to 1.34.2 (#1435) + - f1ce5c06 2024-09-26T00:07:46+00:00 use dependabot for dockerfiles (#1434) + - f5d59ab5 2024-09-26T00:07:33+00:00 :seedling: Bump ghcr.io/grpc-ecosystem/grpc-health-probe docker tag to v0.4.29 (#1432) + - 16d3e75f 2024-09-26T00:07:20+00:00 :seedling: Update bingo + tools (#1433) + - d6d8dd07 2024-09-26T00:07:07+00:00 bump alpine build images to 1.23 (#1430) + - 84fd7180 2024-09-26T00:06:54+00:00 Update grpc-health-probe to latest upstream release (#1425) + - 45d5c108 2024-09-26T00:06:41+00:00 Bump github.com/onsi/ginkgo/v2 from 2.20.0 to 2.20.2 (#1429) + - 327721a4 2024-09-26T00:06:28+00:00 Bump github.com/docker/cli (#1427) + - 62fa57a3 2024-09-26T00:06:15+00:00 Bump github.com/containerd/containerd from 1.7.20 to 1.7.21 (#1426) + - ed62befd 2024-09-26T00:06:02+00:00 Bump go.etcd.io/bbolt from 1.3.10 to 1.3.11 (#1422) + - 7826ac2f 2024-09-26T00:05:49+00:00 Bump github.com/containers/common from 0.60.1 to 0.60.2 (#1419) + - ef5f5d66 2024-09-26T00:05:36+00:00 model: validate unique bundle versions (#1417) + - 85eaebfe 2024-09-26T00:05:23+00:00 Update k8s dependencies to v0.31.0 (#1418) + - e5665959 2024-09-26T00:05:08+00:00 Disable dynamic resource e2e tests (#3403) + - 0bf2fbaa 2024-09-26T00:04:54+00:00 build(deps): bump github.com/prometheus/client_golang (#3400) + - 08479261 2024-09-26T00:04:40+00:00 build(deps): bump github.com/maxbrunsfeld/counterfeiter/v6 (#3401) + - 6fe7e021 2024-09-26T00:04:26+00:00 build(deps): aggregate bump k8s to 0.31.1 and controller-tools to v0.16.3 (#3398) + - 62f9569a 2024-09-26T00:04:08+00:00 fix: call TokenRequest API when service account token secret is missing (#3377) + - edd28854 2024-09-26T00:03:54+00:00 Remove OgSourceProvider (#3360) + - 1fef54e0 2024-09-26T00:03:41+00:00 build(deps): bump github.com/prometheus/client_golang (#3393) + - 5bf3a6f3 2024-09-26T00:03:27+00:00 :seedling: Bump operator-registry from v1.46.0 to v1.47.0 (#3391) + - 6a512344 2024-09-26T00:03:10+00:00 build(deps): bump sigs.k8s.io/controller-tools from 0.16.1 to 0.16.2 (#3383) + - 1bc96528 2024-09-26T00:02:56+00:00 build(deps): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 (#3382) + - 6a903407 2024-09-26T00:02:36+00:00 build(deps): bump github.com/prometheus/common from 0.55.0 to 0.59.1 (#3389) + +- oc image-amd64 d6387d4acdcc020925d993d896437cffbf883671 to 02786574b09edc1bc4ec2361d8056c1d57ae97c0 + - 12ead297 2024-09-27T08:30:38-04:00 nodeimage create: fix outputname flag + - 3f424dac 2024-09-25T16:21:13+03:00 Skip inspection of the daemonset pods running on data plane + - db010056 2024-09-24T17:16:21-07:00 pkg/cli/admin/upgrade/recommend: Add end-to-end output test coverage + +- kubernetes image-amd64 ce117ff87249deb45bf9564d976255645e530105 to 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 + - d656b56da 2024-09-24T11:26:17-04:00 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch + +- oc image-arm64 e75d922ae2a2af65a647dd6c094be9e78d49f7d4 to 02786574b09edc1bc4ec2361d8056c1d57ae97c0 + - 12ead297 2024-09-27T08:30:38-04:00 nodeimage create: fix outputname flag + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 2e95712dfe..750140058a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,32 +1,32 @@ -https://github.com/openshift/api embedded-component 2669d1ebc91092ec32e77b1d3f503b11f759b855 +https://github.com/openshift/api embedded-component f89ab92f1597eaed4de5b947c1781adde2bf42fb https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8122add3d1529f0ea8fa918b45e3d7b35d5a0388 https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224 -https://github.com/openshift/cluster-ingress-operator embedded-component b67185f557fceab56fc27d0fde5f6aca3f96e30c -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9fb047aaed45a81bf817233dde0ca09c8d38e257 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a7e2a74001f3fe7e6be577b2ddef85c3d126a52c -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component bced8cd6e60108d590dfb1f4aa80d4c718f0b3c6 +https://github.com/openshift/cluster-ingress-operator embedded-component 382e2ba9256c536215a15a9244ba1630e2caf35d +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 48d9579a5c4d0f6eb9ddbbc96cb44ccda121ce09 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component cd996bd0fb68227bfd38caf9e0dc5b6a8561c9bb +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e48e04e19b8aaaf1bca99f7a1de89de0ea2690f1 https://github.com/openshift/cluster-network-operator embedded-component 4eec256fe4565434ccf0f4b44ee74d24c40f6850 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 95bd10ad4841d72b46c58078a1e4d2559d5e2c67 https://github.com/openshift/cluster-policy-controller embedded-component 35753b6b1e97843c6856c9866fe1d8a205d05df4 https://github.com/openshift/csi-external-snapshotter embedded-component 672a0d5ea97a71afd0dfb50002319f30db2e10d7 -https://github.com/openshift/etcd embedded-component d3e76939ade21ec3080e53c2cf83b3aac15f5119 -https://github.com/openshift/kubernetes embedded-component ce117ff87249deb45bf9564d976255645e530105 +https://github.com/openshift/etcd embedded-component b3e8498241c28ab67659cb3547694f5267b18836 +https://github.com/openshift/kubernetes embedded-component 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73 -https://github.com/openshift/machine-config-operator embedded-component a6ee4b40c68c3d1c89748f7519886a0e27444685 -https://github.com/openshift/openshift-controller-manager embedded-component c8b7e50875be58338892cf5ebcbc55cad822857a -https://github.com/openshift/operator-framework-olm embedded-component 8dac17a7feed9532363be139d83c0f98200f830a +https://github.com/openshift/machine-config-operator embedded-component 56346ad6c09bb86d6e4b09850dde24b076d101d9 +https://github.com/openshift/openshift-controller-manager embedded-component 979e5c9866d7a674a1cf845b0c84707f7af76616 +https://github.com/openshift/operator-framework-olm embedded-component fccb629eb860057467a9287b23f5f8d2295aead9 https://github.com/openshift/route-controller-manager embedded-component 87dfd7936fc5264ad972dcbc4eb0380dc5cff0db https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-amd64 d6387d4acdcc020925d993d896437cffbf883671 +https://github.com/openshift/oc image-amd64 02786574b09edc1bc4ec2361d8056c1d57ae97c0 https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 https://github.com/openshift/csi-external-snapshotter image-amd64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 https://github.com/openshift/csi-external-snapshotter image-amd64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 https://github.com/openshift/router image-amd64 72114ea78be0a032d5cdddcad694e0a352a00e93 https://github.com/openshift/kube-rbac-proxy image-amd64 89b245aa3dd7a3417000be8ad07287d8b5648872 https://github.com/openshift/ovn-kubernetes image-amd64 b70ae7f5d24c5fcd69a18399419b41468afa6cac -https://github.com/openshift/kubernetes image-amd64 ce117ff87249deb45bf9564d976255645e530105 +https://github.com/openshift/kubernetes image-amd64 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 e75d922ae2a2af65a647dd6c094be9e78d49f7d4 +https://github.com/openshift/oc image-arm64 02786574b09edc1bc4ec2361d8056c1d57ae97c0 https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 From 1fb7242d4b93eaf1452669b471a01a11f6de6829 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:21 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 68 ++++++++++++++++----------------- go.sum | 116 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/go.mod b/go.mod index c0add8b6cd..cc598662b6 100644 --- a/go.mod +++ b/go.mod @@ -219,44 +219,44 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240912105924-ce117ff87249 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240912105924-ce117ff87249 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240925122652-947ea2f8f2a9 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes diff --git a/go.sum b/go.sum index b5bffc4185..b57cdb3db7 100644 --- a/go.sum +++ b/go.sum @@ -461,66 +461,66 @@ github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEco github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8= github.com/openshift/cluster-policy-controller v0.0.0-20240917174913-35753b6b1e97 h1:Ag/VWMLh+OLztQreCRxqvivvQKj99E3/cDgWxra6+HI= github.com/openshift/cluster-policy-controller v0.0.0-20240917174913-35753b6b1e97/go.mod h1:kcmuMziFH9/IdFAZwbBwO49c4Dspy+hsvHeV2nC3b4A= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:h3fIO/R0+T4l+9L1pQp4Isf+2sZ5kjx0ZoMPVmbP0D0= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:GROd9F7kVihnSyLw9wIdX0vzmTirsPhMWaSWb0fOLQc= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:cMk+wc+7EyTm5GcGrDPsM24187kinaEq+T6cLIWL81c= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= -github.com/openshift/kubernetes v0.0.0-20240912105924-ce117ff87249 h1:tdks3OD/IC44khT8UXNPChuQNN/qWo+fyK3mAgFCO8s= -github.com/openshift/kubernetes v0.0.0-20240912105924-ce117ff87249/go.mod h1:ZuY3r8hceVWR+Pa/MI+er0TTCeI6SfOt1usf9wfv72I= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:2VC/9yaVxwr9wmwppgmETOA3TwsoiqHGzjc7A2lJzME= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:d5VbhT5zC0obnL/n8rbQ50zA9o8bz7ub7wqGNYTBNGY= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:JCSvo4bgod+4V/BE2IjXVrwYiqJxr1izrFrZK1qHAxI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= +github.com/openshift/kubernetes v0.0.0-20240925122652-947ea2f8f2a9 h1:m9xzP9mLESNLrLC4h9DLmqxa26QBvft68lyGyBywtXQ= +github.com/openshift/kubernetes v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:ZuY3r8hceVWR+Pa/MI+er0TTCeI6SfOt1usf9wfv72I= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d h1:rnYg1QgPmhuRhyEILvhh20Cmc08ohEwLjMj8oSUBZk8= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 h1:1wHM+B1d/JDDU12p1W0TO9+JogTM1youkNei9OrAzGg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 h1:NE0w/fPIB+KuMhTeEBdMFDOH6fUZwgjO16OVLX6hIOA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249/go.mod h1:fAMOb/XmkaxSaGUkmL1JKZ+hsmKdhKlMgTYqNi/74S0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 h1:/oG/84e9vg8EmKPJNZOPzPWBYlttIknNt4qtM9DMu1g= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 h1:ElmB29+X0WOnS4QT4vAAnkfjBhlZIL+l3hEGQnVmQc4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249/go.mod h1:mIWh73EEfSz/2Ur5dOCfY0Pz/vU3o23KJn/s9pumqGc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 h1:AIydvz5SO3yjaYsA1BBFhHuBxtF2hWG3qG6aYVqIU50= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 h1:Uyd5Wipnd07F98NS3oVrYjk62d6+C57kErgbuF8xP2M= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 h1:3Li06NQ3i1MPxmTDAcr3SbZjd5uKtbBY9eIbGMM3fuU= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249 h1:n4WwRUvCInBzhVYOCYGE6zU+ni3f9azJFVARfrdRvyc= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 h1:3ASeipmTse025qZuB13TZiI+eBYXbtCxTOs4CeayH+Y= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 h1:BK3k8OhPsniMdBPSQcaF68VfD376jG6vvOVN3npH9r0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249/go.mod h1:6EedmW880eVD6uU+oghYW6V2bSO9seMLzd/HIRCDFF8= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 h1:nnwTOvgt8boC4+aahRgUimivKF9uiSwStwmA9HVT5+g= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 h1:EEYgL78aoVWqOPjqr6/MeZ+dRIqVlyAxXIdPnQx6QmU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 h1:CyMHabtYmyvwB4UzP/mrtjCJvHjH253cZ1tUZMPPSjA= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 h1:NR75XKq2CmGd4xbhXfuS6ldT7mAJmJp/V1U/CpFynzc= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 h1:XXZhW0q/k0Twn231OI6dSHKnK3IeKJ0KyLgy3q9XDM8= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 h1:NrGN/+sRydXsOWnC7W9Dq6A3aOMJpUmLhqjdAS7N18w= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 h1:9EKDRqP21YuCUiOiCaNBEvVC+AjOfNrmxawBdZiv2Ko= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249/go.mod h1:jrGMOd6XyjYE6bhCRzoUIbwUhv5f4q/gpBD7BOMDBEY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249 h1:6dRP+E5JGSJEf8iAVtS92jEZXtTLvKIwUPPaRbM1iYE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 h1:kw16v1xLmM7oVLb4/SuFcaHK57e/yI2BzlmJGOOLd94= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 h1:g8eCetMfla93nY49TAynZW8XYMb3IOy43/dW4m9dQ1Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 h1:kuxyjuxCkH7WfcF5J7nNopR7ANaxPpTDc/IEFmrvIkc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 h1:cHy+uKc24gJ2XktUrJ8AykIu323EZaESBfhtWcc7IVo= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 h1:tzYahIMGZa26TUI8hmQ68QOAB+eId2orTlFo8OphcX0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249 h1:jsG8tdQvg3/pAf1/vHtrdbreEbRfUG8Lowvc7L6GIDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 h1:VO1q9VORiStQyvMt0G7dOi7pgdcRp4lyqLOpZeIlPG4= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 h1:+p0/FFQmYen3cSa3xHi7Q1Ikp3hSsWQ3caoN1mcC1Mg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 h1:SDpViVF3f0cye25ZdOzJuTANrR5tyrDMbvAOENZamWs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:fAMOb/XmkaxSaGUkmL1JKZ+hsmKdhKlMgTYqNi/74S0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 h1:7laAWmv1Xyv+OLF2b6J52XUE+UkHpb3xlihxvdqO6pY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 h1:je1VVxDB60ig4hFk5hilVpcVMYT6vLBhnujEeudr1Yw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:mIWh73EEfSz/2Ur5dOCfY0Pz/vU3o23KJn/s9pumqGc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 h1:PcnCt6sOU2Sc7o6k3rU31TYPWNzXjP/dtUWmbib1SyE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 h1:7NGf6rONp10VuK2/aMuGlhJqe23wfa0eYzoIkgyAb60= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 h1:CtMMGUP1ja1BX1qgQWhbOBDlUOdRnFDtLPCVo9qfIvQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 h1:4ZACQ7E3pBXMWh1FAyWZy/q54aVdU4KxFCpmsppjf00= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 h1:WyAXR/vbPGZLngj+poTKdBina/eGGHykF/QLYsti0Ek= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 h1:ET8aDVNtqObqyl7c67DnIQGqY34KUgkOwwutSr0h7m4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:6EedmW880eVD6uU+oghYW6V2bSO9seMLzd/HIRCDFF8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 h1:UFj7UpG7EOeBrcRbvHYxG4XtH479PiYPc8PTES8MJsY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 h1:sAEomfuB+V2O11vaL63iDIrW6QrS1W9qz+f3v7ZMRpY= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 h1:XeK4xamqcxClJKh0wr3GyvIoD968fWgPDookpkPBvWo= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 h1:xmmgQML58ErqueJjlIFl1klMx2deN8V4JiFPktpKlXo= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 h1:XbjsvSJ6dS0Lw1yT1rUh6pbvmCrbE19gkrUcnjZXb8M= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 h1:UQZTGFiclbQTbqpTUTC7tYiVzn3p6fgaPeCxKQgFPuA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 h1:tSmrAgZij8m3yPf6/H/cXRnUkwLF0RbjhEEROWKagJo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:jrGMOd6XyjYE6bhCRzoUIbwUhv5f4q/gpBD7BOMDBEY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 h1:8NyYguwksRd1M5NdX95QvtEN0YHsUw+rv8l/WhgXTEU= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 h1:GVCYETrppz0pbOnoIssE+iCGEqxeV6vnGizyAGdt5Fo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 h1:S7PgCwPlx9fggNVtV+2qmKBWSah09m2XmLLylsMUKiQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 h1:YqbDAxe7uNhfmOWNc0dEFNH86U0xvnlyYF1QUNiSzOE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 h1:mSqYimGQBCcQOkyXKawKxUT40w+gNdX3gjiizAIQG4U= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 h1:kwg8MxO0Csae7vaTqgsgdeHt5A6dx6FO/993b8Z7dgE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 h1:8xp9fxSA1/SjyeNLpY5e8V7kndWBMIOeIciQx2uKfZA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 h1:P/OCo9o54bwvmpIBchOEWnFv6lZszHuKZc37Y2Y542g= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 82d28f27cfc96a4eeaca07e6c0158597caf73b8a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:42 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../framework/plugins/volumebinding/binder.go | 60 --------- .../plugins/volumebinding/fake_binder.go | 6 - .../plugins/volumebinding/volume_binding.go | 10 +- .../k8s.io/kubernetes/pkg/volume/util/util.go | 38 ------ vendor/modules.txt | 126 +++++++++--------- 5 files changed, 64 insertions(+), 176 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go index f6ce916c6b..5ab477e1e0 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go @@ -45,7 +45,6 @@ import ( v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/metrics" - "k8s.io/kubernetes/pkg/volume/util" ) // ConflictReason is used for the special strings which explain why @@ -127,8 +126,6 @@ type InTreeToCSITranslator interface { // 1. The scheduler takes a Pod off the scheduler queue and processes it serially: // a. Invokes all pre-filter plugins for the pod. GetPodVolumeClaims() is invoked // here, pod volume information will be saved in current scheduling cycle state for later use. -// If pod has bound immediate PVCs, GetEligibleNodes() is invoked to potentially reduce -// down the list of eligible nodes based on the bound PV's NodeAffinity (if any). // b. Invokes all filter plugins, parallelized across nodes. FindPodVolumes() is invoked here. // c. Invokes all score plugins. Future/TBD // d. Selects the best node for the Pod. @@ -151,14 +148,6 @@ type SchedulerVolumeBinder interface { // unbound with immediate binding (including prebound) and PVs that belong to storage classes of unbound PVCs with delayed binding. GetPodVolumeClaims(logger klog.Logger, pod *v1.Pod) (podVolumeClaims *PodVolumeClaims, err error) - // GetEligibleNodes checks the existing bound claims of the pod to determine if the list of nodes can be - // potentially reduced down to a subset of eligible nodes based on the bound claims which then can be used - // in subsequent scheduling stages. - // - // If eligibleNodes is 'nil', then it indicates that such eligible node reduction cannot be made - // and all nodes should be considered. - GetEligibleNodes(logger klog.Logger, boundClaims []*v1.PersistentVolumeClaim) (eligibleNodes sets.Set[string]) - // FindPodVolumes checks if all of a Pod's PVCs can be satisfied by the // node and returns pod's volumes information. // @@ -381,55 +370,6 @@ func (b *volumeBinder) FindPodVolumes(logger klog.Logger, pod *v1.Pod, podVolume return } -// GetEligibleNodes checks the existing bound claims of the pod to determine if the list of nodes can be -// potentially reduced down to a subset of eligible nodes based on the bound claims which then can be used -// in subsequent scheduling stages. -// -// Returning 'nil' for eligibleNodes indicates that such eligible node reduction cannot be made and all nodes -// should be considered. -func (b *volumeBinder) GetEligibleNodes(logger klog.Logger, boundClaims []*v1.PersistentVolumeClaim) (eligibleNodes sets.Set[string]) { - if len(boundClaims) == 0 { - return - } - - var errs []error - for _, pvc := range boundClaims { - pvName := pvc.Spec.VolumeName - pv, err := b.pvCache.GetPV(pvName) - if err != nil { - errs = append(errs, err) - continue - } - - // if the PersistentVolume is local and has node affinity matching specific node(s), - // add them to the eligible nodes - nodeNames := util.GetLocalPersistentVolumeNodeNames(pv) - if len(nodeNames) != 0 { - // on the first found list of eligible nodes for the local PersistentVolume, - // insert to the eligible node set. - if eligibleNodes == nil { - eligibleNodes = sets.New(nodeNames...) - } else { - // for subsequent finding of eligible nodes for the local PersistentVolume, - // take the intersection of the nodes with the existing eligible nodes - // for cases if PV1 has node affinity to node1 and PV2 has node affinity to node2, - // then the eligible node list should be empty. - eligibleNodes = eligibleNodes.Intersection(sets.New(nodeNames...)) - } - } - } - - if len(errs) > 0 { - logger.V(4).Info("GetEligibleNodes: one or more error occurred finding eligible nodes", "error", errs) - return nil - } - - if eligibleNodes != nil { - logger.V(4).Info("GetEligibleNodes: reduced down eligible nodes", "nodes", eligibleNodes) - } - return -} - // AssumePodVolumes will take the matching PVs and PVCs to provision in pod's // volume information for the chosen node, and: // 1. Update the pvCache with the new prebound PV. diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/fake_binder.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/fake_binder.go index 667669c65b..f563c3c756 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/fake_binder.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/fake_binder.go @@ -20,7 +20,6 @@ import ( "context" v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" ) @@ -55,11 +54,6 @@ func (b *FakeVolumeBinder) GetPodVolumeClaims(_ klog.Logger, pod *v1.Pod) (podVo return &PodVolumeClaims{}, nil } -// GetEligibleNodes implements SchedulerVolumeBinder.GetEligibleNodes. -func (b *FakeVolumeBinder) GetEligibleNodes(_ klog.Logger, boundClaims []*v1.PersistentVolumeClaim) (eligibleNodes sets.Set[string]) { - return nil -} - // FindPodVolumes implements SchedulerVolumeBinder.FindPodVolumes. func (b *FakeVolumeBinder) FindPodVolumes(_ klog.Logger, pod *v1.Pod, _ *PodVolumeClaims, node *v1.Node) (podVolumes *PodVolumes, reasons ConflictReasons, err error) { return nil, b.config.FindReasons, b.config.FindErr diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go index cb56ed9260..2bb0fb56b6 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go @@ -194,14 +194,6 @@ func (pl *VolumeBinding) PreFilter(ctx context.Context, state *framework.CycleSt status.AppendReason("pod has unbound immediate PersistentVolumeClaims") return nil, status } - // Attempt to reduce down the number of nodes to consider in subsequent scheduling stages if pod has bound claims. - var result *framework.PreFilterResult - if eligibleNodes := pl.Binder.GetEligibleNodes(logger, podVolumeClaims.boundClaims); eligibleNodes != nil { - result = &framework.PreFilterResult{ - NodeNames: eligibleNodes, - } - } - state.Write(stateKey, &stateData{ podVolumesByNode: make(map[string]*PodVolumes), podVolumeClaims: &PodVolumeClaims{ @@ -210,7 +202,7 @@ func (pl *VolumeBinding) PreFilter(ctx context.Context, state *framework.CycleSt unboundVolumesDelayBinding: podVolumeClaims.unboundVolumesDelayBinding, }, }) - return result, nil + return nil, nil } // PreFilterExtensions returns prefilter extensions, pod add and remove. diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go index 601dc64601..d1691cd806 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go @@ -575,44 +575,6 @@ func IsLocalEphemeralVolume(volume v1.Volume) bool { volume.ConfigMap != nil } -// GetLocalPersistentVolumeNodeNames returns the node affinity node name(s) for -// local PersistentVolumes. nil is returned if the PV does not have any -// specific node affinity node selector terms and match expressions. -// PersistentVolume with node affinity has select and match expressions -// in the form of: -// -// nodeAffinity: -// required: -// nodeSelectorTerms: -// - matchExpressions: -// - key: kubernetes.io/hostname -// operator: In -// values: -// - -// - -func GetLocalPersistentVolumeNodeNames(pv *v1.PersistentVolume) []string { - if pv == nil || pv.Spec.NodeAffinity == nil || pv.Spec.NodeAffinity.Required == nil { - return nil - } - - var result sets.Set[string] - for _, term := range pv.Spec.NodeAffinity.Required.NodeSelectorTerms { - var nodes sets.Set[string] - for _, matchExpr := range term.MatchExpressions { - if matchExpr.Key == v1.LabelHostname && matchExpr.Operator == v1.NodeSelectorOpIn { - if nodes == nil { - nodes = sets.New(matchExpr.Values...) - } else { - nodes = nodes.Intersection(sets.New(matchExpr.Values...)) - } - } - } - result = result.Union(nodes) - } - - return sets.List(result) -} - // GetPodVolumeNames returns names of volumes that are used in a pod, // either as filesystem mount or raw block device, together with list // of all SELinux contexts of all containers that use the volumes. diff --git a/vendor/modules.txt b/vendor/modules.txt index 9619eb7027..2d55016251 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -868,7 +868,7 @@ github.com/vishvananda/netns # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -876,7 +876,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -884,7 +884,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1279,7 +1279,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1338,7 +1338,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1385,7 +1385,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1453,7 +1453,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1625,13 +1625,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1978,7 +1978,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2001,14 +2001,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-20240912105924-ce117ff87249 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2042,7 +2042,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2055,7 +2055,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2072,20 +2072,20 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured/namedresources/cel -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2110,13 +2110,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2147,7 +2147,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-20240912105924-ce117ff87249 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2180,11 +2180,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2219,7 +2219,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2241,7 +2241,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3053,11 +3053,11 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/legacy-cloud-providers/gce k8s.io/legacy-cloud-providers/gce/gcpcredential -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3072,10 +3072,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-20240912105924-ce117ff87249 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3226,38 +3226,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240912105924-ce117ff87249 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240912105924-ce117ff87249 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240912105924-ce117ff87249 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240925122652-947ea2f8f2a9 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 From c51fe5d3d345256d5799ffb2aaaf628b1ceac7e3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:42 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 72 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 52 +++++++++++++++++++------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 1195a961d6..5dc6fd3bb4 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,41 +144,41 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240903070029-d3e76939ade2 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240912105924-ce117ff87249 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240912105924-ce117ff87249 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240927161523-b3e8498241c2 // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 2ef675b994..a27ed2cbfa 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -188,32 +188,32 @@ github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9Xa github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:h3fIO/R0+T4l+9L1pQp4Isf+2sZ5kjx0ZoMPVmbP0D0= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:GROd9F7kVihnSyLw9wIdX0vzmTirsPhMWaSWb0fOLQc= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:cMk+wc+7EyTm5GcGrDPsM24187kinaEq+T6cLIWL81c= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:iTfjsLfCY2wlAeEnM2z8vJh8KepayJFyk3HuiEWWOwc= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:FTiX5LxVDANyfvDKXyPgf0B8qYgUFR8GQMCUVAYVkvc= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:/g+Zx2nuYg/avrF64SOAGfV40By3iQgQy5rKgRCUmBo= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:hlets2VEeYF+XgTh3LjKq3xe574wlGuGwb+oYZDSjog= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240903070029-d3e76939ade2 h1:/hi9GNBQXXuV92kNiFpeS7p0CztHKwLKDLk2tDK3kiA= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240903070029-d3e76939ade2/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 h1:1wHM+B1d/JDDU12p1W0TO9+JogTM1youkNei9OrAzGg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 h1:/oG/84e9vg8EmKPJNZOPzPWBYlttIknNt4qtM9DMu1g= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 h1:ElmB29+X0WOnS4QT4vAAnkfjBhlZIL+l3hEGQnVmQc4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249/go.mod h1:mIWh73EEfSz/2Ur5dOCfY0Pz/vU3o23KJn/s9pumqGc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 h1:AIydvz5SO3yjaYsA1BBFhHuBxtF2hWG3qG6aYVqIU50= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 h1:Uyd5Wipnd07F98NS3oVrYjk62d6+C57kErgbuF8xP2M= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 h1:3ASeipmTse025qZuB13TZiI+eBYXbtCxTOs4CeayH+Y= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 h1:g8eCetMfla93nY49TAynZW8XYMb3IOy43/dW4m9dQ1Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:2VC/9yaVxwr9wmwppgmETOA3TwsoiqHGzjc7A2lJzME= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:d5VbhT5zC0obnL/n8rbQ50zA9o8bz7ub7wqGNYTBNGY= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:JCSvo4bgod+4V/BE2IjXVrwYiqJxr1izrFrZK1qHAxI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:7uBtpKPAL4LKKMBBcIWLckhxithShwumK0dV/QpgMvM= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:FTiX5LxVDANyfvDKXyPgf0B8qYgUFR8GQMCUVAYVkvc= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:OkUESDLzVcDIlYMToyp++ycXXKThVcqV285uS+6ML68= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:hlets2VEeYF+XgTh3LjKq3xe574wlGuGwb+oYZDSjog= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240927161523-b3e8498241c2 h1:t7fwL3KeVH+UcWeRo7BXe9A6xB9pKXHeJn6C83fwiy8= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240927161523-b3e8498241c2/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 h1:+p0/FFQmYen3cSa3xHi7Q1Ikp3hSsWQ3caoN1mcC1Mg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 h1:7laAWmv1Xyv+OLF2b6J52XUE+UkHpb3xlihxvdqO6pY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 h1:je1VVxDB60ig4hFk5hilVpcVMYT6vLBhnujEeudr1Yw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:mIWh73EEfSz/2Ur5dOCfY0Pz/vU3o23KJn/s9pumqGc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 h1:PcnCt6sOU2Sc7o6k3rU31TYPWNzXjP/dtUWmbib1SyE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 h1:7NGf6rONp10VuK2/aMuGlhJqe23wfa0eYzoIkgyAb60= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 h1:WyAXR/vbPGZLngj+poTKdBina/eGGHykF/QLYsti0Ek= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:rquYFomGlvuu8RGyZAboaJxxcwfian65NZ00VUQ5scs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 h1:S7PgCwPlx9fggNVtV+2qmKBWSah09m2XmLLylsMUKiQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From e137fdf62d6f98edc87b3af62357a0ae72867aa6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:48 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../openshift/microshift/pkg/config/config.go | 8 ++ .../microshift/pkg/config/network.go | 38 +++++++ etcd/vendor/modules.txt | 98 +++++++++---------- 3 files changed, 95 insertions(+), 49 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go index 221dd29a67..f0438c7131 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go @@ -164,6 +164,10 @@ func (c *Config) incorporateUserSettings(u *Config) { c.DNS.BaseDomain = u.DNS.BaseDomain } + if u.Network.CNIPlugin != "" { + c.Network.CNIPlugin = u.Network.CNIPlugin + } + if len(u.Network.ClusterNetwork) != 0 { c.Network.ClusterNetwork = u.Network.ClusterNetwork } @@ -368,6 +372,10 @@ func (c *Config) validate() error { return fmt.Errorf("error validating networks: %w", err) } + if !c.Network.validCNIPlugin() { + return fmt.Errorf("invalid cni plugin for network configuration %q", c.Network.CNIPlugin) + } + //nolint:nestif // extracting the nested ifs will just increase the complexity of the if expressions as validation expands if len(c.ApiServer.SubjectAltNames) > 0 { // Any entry in SubjectAltNames will be included in the external access certificates. diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/network.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/network.go index 7749fd3ea3..cfde3f91df 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/network.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/network.go @@ -5,9 +5,36 @@ import ( "net" "github.com/apparentlymart/go-cidr/cidr" + "k8s.io/apimachinery/pkg/util/sets" +) + +// CNIPlugin is an enum value that determines whether MicroShift deploys OVNK. +// +kubebuilder:validation:Enum:="";none;ovnk +type CNIPlugin string + +const ( + // CniPluginUnset exists to support backwards compatibility with existing MicroShift clusters. When .network.cniPlugin is + // "", MicroShift will default to deploying OVNK. This preserves the current deployment behavior of existing + // clusters. + CniPluginUnset CNIPlugin = "" + // CniPluginNone signals MicroShift to not deploy the LVMS components. Setting the value for a cluster that has already + // deployed LVMS will not cause LVMS to be deleted. Otherwise, volumes already deployed on the cluster would be + // orphaned once their workloads stop or restart. + CniPluginNone CNIPlugin = "none" + // CniPluginOVNK is equivalent to CniPluginUnset, and explicitly tells MicroShift to deploy OVNK. This option exists to + // provide a differentiation between OVNK and potential future CNI options. + CniPluginOVNK CNIPlugin = "ovnk" ) type Network struct { + // CNIPlugin is a user defined string value matching one of the above CNI values. MicroShift uses this + // value to decide whether to deploy the OVN-K as default CNI. An unset field defaults to "" during yaml parsing, and thus + // could mean that the cluster has been upgraded. In order to support the existing out-of-box behavior, MicroShift + // assumes an empty string to mean the OVN-K should be deployed. + // Allowed values are: unset or one of ["", "ovnk", "none"] + // +kubebuilder:validation:Optional + CNIPlugin CNIPlugin `json:"cniPlugin,omitempty"` + // IP address pool to use for pod IPs. // This field is immutable after installation. // +kubebuilder:default={"10.42.0.0/16"} @@ -63,3 +90,14 @@ func isValidIPAddress(ipAddress string) bool { ip := net.ParseIP(ipAddress) return ip != nil } + +func (n Network) validCNIPlugin() (isSupported bool) { + return sets.New[CNIPlugin](CniPluginUnset, CniPluginOVNK, CniPluginNone).Has(n.CNIPlugin) +} + +// IsEnabled returns false only when .network.cniPlugin: "none". An empty value is considered "enabled" +// for backwards compatibility. Otherwise, the meaning of the config would silently change after an +// upgrade from enabled-by-default to disabled-by-default. +func (n Network) IsEnabled() bool { + return n.CNIPlugin != CniPluginNone +} diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 9ee7592fe1..756d86cc8c 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -270,7 +270,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.10 ## explicit; go 1.21 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -279,7 +279,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -292,14 +292,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.14 ## explicit; go 1.21 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.14 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/client/v3 v3.5.14 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.14 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/pkg/v3 v3.5.14 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -316,14 +316,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.14 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/raft/v3 v3.5.14 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240903070029-d3e76939ade2 +# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240927161523-b3e8498241c2 ## explicit; go 1.21 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -677,7 +677,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -733,17 +733,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -892,7 +892,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -929,7 +929,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1050,39 +1050,39 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240903070029-d3e76939ade2 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240912105924-ce117ff87249 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240912105924-ce117ff87249 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240912105924-ce117ff87249 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240912105924-ce117ff87249 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240912105924-ce117ff87249 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240912105924-ce117ff87249 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240912105924-ce117ff87249 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240912105924-ce117ff87249 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240912105924-ce117ff87249 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240912105924-ce117ff87249 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240912105924-ce117ff87249 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240912105924-ce117ff87249 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240912105924-ce117ff87249 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240912105924-ce117ff87249 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240912105924-ce117ff87249 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240912105924-ce117ff87249 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240912105924-ce117ff87249 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240927161523-b3e8498241c2 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240925122652-947ea2f8f2a9 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240925122652-947ea2f8f2a9 From c46da60315db63f516a6e1d567965b3e6d618d63 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:49 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index fefde6b769..f1d796c9da 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:654bbec52fff0eb1d5541ec5259ac70f6a3d4e6f3f7df7de6b344a9e135f048a" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83a6c4667904c63c6531026b03de23bf3c2bb30d5174043bf38374e7c5ddb806" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 78b75fac7cf090b166ecb353de585dc9fdc8695d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:51 +0000 Subject: [PATCH 8/9] update manifests --- .../kube-controller-manager/defaultconfig.yaml | 2 ++ assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../0000_50_olm_00-catalogsources.crd.yaml | 2 +- .../0000_50_olm_00-clusterserviceversions.crd.yaml | 2 +- .../0000_50_olm_00-installplans.crd.yaml | 2 +- .../0000_50_olm_00-olmconfigs.crd.yaml | 2 +- .../0000_50_olm_00-operatorconditions.crd.yaml | 2 +- .../0000_50_olm_00-operatorgroups.crd.yaml | 2 +- .../0000_50_olm_00-operators.crd.yaml | 2 +- .../0000_50_olm_00-subscriptions.crd.yaml | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 6 +++--- 17 files changed, 31 insertions(+), 29 deletions(-) diff --git a/assets/controllers/kube-controller-manager/defaultconfig.yaml b/assets/controllers/kube-controller-manager/defaultconfig.yaml index 4cb47f0949..9c80e2105f 100644 --- a/assets/controllers/kube-controller-manager/defaultconfig.yaml +++ b/assets/controllers/kube-controller-manager/defaultconfig.yaml @@ -20,6 +20,8 @@ extendedArguments: - "-ttl" # TODO: this is excluded in kube-core, but not in #21092 - "-bootstrapsigner" - "-tokencleaner" + cloud-provider: + - "external" cluster-signing-duration: - "720h" secure-port: diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index a10bfa3035..170e1d9763 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-09-27-000855" + "base": "4.18.0-0.nightly-arm64-2024-09-29-233859" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b10e8eb8c507b1f0c630480acb9f3c82a8da74522e271a46983b50d413a20b77", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index fdeab15b6f..893dee07db 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-09-23-182657" + "base": "4.18.0-0.nightly-2024-09-29-150556" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2184410d2afe1ae682931d0e213aa8743b757440379caac425833e56f831726", diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml index 0396bb39d5..93d5d5c462 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml index f7d74503b7..7436f97865 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml index 49f14a6a98..e92cee39a0 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml index d66dd92ccc..6dc30491f9 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml index 7041fc71e9..8dba7a4afa 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml index 5297197c61..802b9eb7f5 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml index 5c519ee286..102e69c9f4 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml index e4df79c53c..6fe7db5dbe 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.16.3 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 288f3eea69..0ca9afce7e 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b + digest: sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a + digest: sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 023e097784..e870c6ac3f 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca + digest: sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c + digest: sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 0959368f24..0087b481c8 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-09-27-000855" + "base": "4.18.0-0.nightly-arm64-2024-09-29-233859" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 52b1c85f1b..6097b14b20 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-2024-09-23-182657" + "base": "4.18.0-0.nightly-2024-09-29-150556" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 9a60518305..37115a8fe7 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-09-27-000855" + "base": "4.18.0-0.nightly-arm64-2024-09-29-233859" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a8e175cac0f0229166d5e97a0c43eab60d90023a4cbf269b898d90f08111c19", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7900670845b19f28e6dfadfa8efb0c7111487d41690ae6ce74098ffc1c74c18a", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7869c9e060124b06c4486138ed1f19fc45e7cbf8a91ffa37059d8654f36ef88", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f44f25911cdf4775490eb0242185ec084f5ed70ae32969e33203bc5d284462a", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f741a64c9b..9d92ebec56 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.18.0-0.nightly-2024-09-23-182657" + "base": "4.18.0-0.nightly-2024-09-29-150556" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3edf3c693cfc79da6c1c6dda374307e3df94f7dbb9cad1c4fcc40d1419018198", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c2c63d66669138e688c5259b8180dde2bf8847c5f78e2a6850408b35a8a91b8", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14739663e72485d7746c10f47726672226e9594b3c5b2c51f8f1295e1416512c", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11c644a2788763eccd0df75e7dbfaae12b8a8f9363080e158af4b142005a8ce0", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbae6a3ee56ada7c58f5c49b8c457cea56860241302725ceacd2860f0e630bce", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:654bbec52fff0eb1d5541ec5259ac70f6a3d4e6f3f7df7de6b344a9e135f048a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83a6c4667904c63c6531026b03de23bf3c2bb30d5174043bf38374e7c5ddb806", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e29c65ce36d9e085364ce61ec901c731fb370d104d7b6f81fcb829875f213e1", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:86f0b8a3a1a699feff2d77d57b0917eaae501086b91c8ae3cbf31e5454967089", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab451c506f5a46dcb90ac2b6beeec9ed9d765569f2f452f31d8560b0123cdf16", From e54363d95093f30271e86f9ee7024f6d2a2e0bcd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 30 Sep 2024 04:26:53 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index c21bccaf30..dd85ab9159 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.3 -KUBE_GIT_COMMIT=ce117ff87249deb45bf9564d976255645e530105 +KUBE_GIT_COMMIT=947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 7a522a9b95..ea5cdca5b1 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-27-000855 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-29-233859 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index d3d5994351..2183d666e0 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-09-23-182657 +OCP_VERSION := 4.18.0-0.nightly-2024-09-29-150556