From 94011a8702516c0329c9ae9c24f6b288eeb76b19 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:10:01 +0000 Subject: [PATCH 1/9] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index fe1ab7e4f1..7b799ca73f 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-01-221530" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-02-155822" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-04-162615" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-04-234139" From 61e9cb9b39e1f4dd8eea9f79cbfd3065767d543d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:10:01 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 68 +++++++++++++++++++++++++++++-- scripts/auto-rebase/commits.txt | 16 ++++---- 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 4bfdeee623..1748f4c61c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,68 @@ -- api embedded-component 0689f006bcdeccf685c75438835beffa8bb14db7 to d3b3bb16a38282191881195f617fd494a9cb922b - - e3df50e 2024-06-07T11:10:23-04:00 OCPBUGS-34906: Fix IngressController missing listTypes +- api embedded-component d3b3bb16a38282191881195f617fd494a9cb922b to 33ed71ab039fca2a3292968abddde1065bf61784 + - 8a9df47 2024-07-03T10:11:15+02:00 features: add multi-arch feature gate per platform + - 99bfe92 2024-07-03T10:04:03+02:00 OCPBUGS-36213: Remove the conversion webhook reference from the ConsolePlugin CRD spec + - 3023dee 2024-07-02T13:10:49+02:00 Add ClusterMonitoring feature gate + - 2a454c7 2024-07-01T11:44:21+02:00 TP: Add NetworkSegmentation Feature Gate + - d7b7087 2024-06-25T14:19:58-04:00 Update (cluster)imagepolicy doc no restriction on release repo scopes -- kubernetes image-arm64 733cc9d44d7c449f231313a8f158e265afa4b8c6 to 421e90ed9ef07c1a797386e662255dfb830a6b9f +- cluster-network-operator embedded-component 4b792c659385948e825d2ba17b8f6d2e5c3acfed to 33070b57aac78118eea34060adef7f2fb7b7b4bf + - 1cc35b9 2024-07-01T19:33:06+02:00 Fix featuregates module change + - 7ec85b9 2024-07-01T19:33:06+02:00 Fix IsValidIP func change + - 997c2cf 2024-07-01T19:32:40+02:00 Bump ocp/api + +- kubernetes embedded-component 733cc9d44d7c449f231313a8f158e265afa4b8c6 to 421e90ed9ef07c1a797386e662255dfb830a6b9f - 40b3b0cd3 2024-06-26T14:00:52+02:00 UPSTREAM: : update base image +- machine-config-operator embedded-component 444decb1dfd1ebb3fb7c2e5a96ff3b3d53b6f492 to 0f53196f6480481d3f5a04e217a143a56d4db79e + - 583ae9a2 2024-06-28T11:29:02-05:00 Bootstrap e2e test featuregate setup does not match the actual code + - 24183b4b 2024-06-24T11:00:02-05:00 Pick up openshift/kubernetes 1.30 rebase updates + - c7d6ec27 2024-06-21T14:53:23-04:00 MCD-pull: run after network-online.target in Azure + +- operator-framework-olm embedded-component 0b14e86bcc2368a4d0201f8de7ea322f11e6f236 to a6a66e275c51291a551ff7076f47128fad216094 + - 94afedef 2024-07-04T09:40:50+02:00 add output-dir to E2E_GINKGO_OPTS + - adf348cb 2024-07-02T16:49:52+02:00 [CARRY] add junit report + - 369dfdbc 2024-07-02T16:33:09+02:00 provide required schema for basic template and fbc conversion (#1335) + - e64f24e2 2024-07-02T16:32:34+02:00 Bump github.com/docker/cli (#1366) + - abaac0a2 2024-07-02T16:32:29+02:00 Bump github.com/docker/cli (#1365) + - 23518bb4 2024-07-02T16:32:23+02:00 generate binary-less dockerfiles (#1338) + - 94f4bcbf 2024-07-02T16:32:18+02:00 Bump github.com/containers/image/v5 from 5.31.0 to 5.31.1 (#1363) + - a397f90d 2024-07-02T16:32:12+02:00 Fix codecov-action params (#1361) + - df7500ae 2024-07-02T16:32:07+02:00 Bump github.com/spf13/cobra from 1.8.0 to 1.8.1 (#1359) + - cb64f6e6 2024-07-02T16:32:02+02:00 Bump github.com/operator-framework/api from 0.25.0 to 0.26.0 (#1358) + - 6acf8fa9 2024-07-02T16:31:56+02:00 Bump k8s.io/apiextensions-apiserver from 0.30.1 to 0.30.2 (#1355) + - 0ef42c49 2024-07-02T16:31:50+02:00 Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.26 to 0.4.29 (#1352) + - 39dae176 2024-07-02T16:31:45+02:00 Bump google.golang.org/protobuf from 1.34.1 to 1.34.2 (#1353) + - 23bfaeeb 2024-07-02T16:31:39+02:00 deprecate composite template (#1339) + - fd159217 2024-07-02T16:31:34+02:00 Bump golang.org/x/mod from 0.17.0 to 0.18.0 (#1347) + - eb7b1373 2024-07-02T16:31:28+02:00 Bump github.com/docker/cli (#1348) + - e765ec29 2024-07-02T16:31:23+02:00 Bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 (#1346) + - e43f8a49 2024-07-02T16:31:17+02:00 Bump golang.org/x/net from 0.25.0 to 0.26.0 (#1344) + - 132ac0b3 2024-07-02T16:31:12+02:00 Bump github.com/containers/common from 0.59.0 to 0.59.1 (#1342) + - 374b62eb 2024-07-02T16:31:06+02:00 Bump golang.org/x/text from 0.15.0 to 0.16.0 (#1341) + - 16b251d4 2024-07-02T16:31:01+02:00 Bump github.com/containerd/containerd from 1.7.17 to 1.7.18 (#1343) + - 812177d7 2024-07-02T16:30:55+02:00 Bump golang.org/x/sys from 0.20.0 to 0.21.0 (#1345) + - 3b437efb 2024-07-02T16:30:50+02:00 Bump google.golang.org/grpc/cmd/protoc-gen-go-grpc from 1.3.0 to 1.4.0 (#1340) + - 581538c2 2024-07-02T16:30:44+02:00 Makefile: avoid ?= shell executions (#1328) + - c2c0dfa0 2024-07-02T16:30:38+02:00 Bump github.com/onsi/ginkgo/v2 from 2.18.0 to 2.19.0 (#1327) + - 7f156e85 2024-07-02T16:30:33+02:00 Bump sigs.k8s.io/controller-runtime from 0.18.2 to 0.18.3 (#1326) + - 473ad6c9 2024-07-02T16:30:28+02:00 mark flaky tests (#3333) + - 71eb4544 2024-07-02T16:30:21+02:00 bump operator-registry to v1.44.0 (#3335) + - 6e434b6c 2024-07-02T16:30:14+02:00 update ginkgo opts (#3337) + - 4ce3d446 2024-07-02T16:30:09+02:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + - 414c4a6d 2024-07-01T08:29:15-05:00 don't erase the filesystem from the base + +- oc image-amd64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 to 71b0067b9e9c10266f0ba68d0f249455cc118c35 + - 8fe64c57 2024-07-04T07:50:27+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed + - 2591a370 2024-07-04T07:50:23+02:00 Lower case command value before comparision + - ebc21197 2024-07-04T07:50:17+02:00 bump(k8s.io)=1.30.2 + - 17a3fe02 2024-07-02T15:37:46+02:00 pkg/cli/admin/mustgather: GA since and since-time flags + +- kubernetes image-amd64 733cc9d44d7c449f231313a8f158e265afa4b8c6 to 421e90ed9ef07c1a797386e662255dfb830a6b9f + - 40b3b0cd3 2024-06-26T14:00:52+02:00 UPSTREAM: : update base image + +- oc image-arm64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 to 71b0067b9e9c10266f0ba68d0f249455cc118c35 + - 8fe64c57 2024-07-04T07:50:27+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed + - 2591a370 2024-07-04T07:50:23+02:00 Lower case command value before comparision + - ebc21197 2024-07-04T07:50:17+02:00 bump(k8s.io)=1.30.2 + - 17a3fe02 2024-07-02T15:37:46+02:00 pkg/cli/admin/mustgather: GA since and since-time flags + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ec6d797184..1ca8cac65e 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,23 +1,23 @@ -https://github.com/openshift/api embedded-component d3b3bb16a38282191881195f617fd494a9cb922b +https://github.com/openshift/api embedded-component 33ed71ab039fca2a3292968abddde1065bf61784 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component e8e9cc1b8038a777459d745e69b786066b45d47f https://github.com/openshift/cluster-dns-operator embedded-component 3c5bb64b9b5f9b4c3132c4c38d74155037009370 https://github.com/openshift/cluster-ingress-operator embedded-component b18a07c414696eb01170180d9dc8b5c221909d68 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a88d4ae8e0a9c8d3457e8488d9da7f04680240d3 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 796d029c836e76e9312aefabf72fdde028a286b3 -https://github.com/openshift/cluster-network-operator embedded-component 4b792c659385948e825d2ba17b8f6d2e5c3acfed +https://github.com/openshift/cluster-network-operator embedded-component 33070b57aac78118eea34060adef7f2fb7b7b4bf https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2bb0cde622cd4a705720987cf897719229acf3d8 https://github.com/openshift/cluster-policy-controller embedded-component c502ece1b8bdccdbc58a327520685d9a1d2f59cf https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 -https://github.com/openshift/kubernetes embedded-component 733cc9d44d7c449f231313a8f158e265afa4b8c6 +https://github.com/openshift/kubernetes embedded-component 421e90ed9ef07c1a797386e662255dfb830a6b9f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 444decb1dfd1ebb3fb7c2e5a96ff3b3d53b6f492 +https://github.com/openshift/machine-config-operator embedded-component 0f53196f6480481d3f5a04e217a143a56d4db79e https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6 -https://github.com/openshift/operator-framework-olm embedded-component 0b14e86bcc2368a4d0201f8de7ea322f11e6f236 +https://github.com/openshift/operator-framework-olm embedded-component a6a66e275c51291a551ff7076f47128fad216094 https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-amd64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 +https://github.com/openshift/oc image-amd64 71b0067b9e9c10266f0ba68d0f249455cc118c35 https://github.com/openshift/coredns image-amd64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 @@ -25,9 +25,9 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f05 https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 https://github.com/openshift/ovn-kubernetes image-amd64 1356c9b67dc0f07b71537117f1fce09a34b9b5cf -https://github.com/openshift/kubernetes image-amd64 733cc9d44d7c449f231313a8f158e265afa4b8c6 +https://github.com/openshift/kubernetes image-amd64 421e90ed9ef07c1a797386e662255dfb830a6b9f https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 +https://github.com/openshift/oc image-arm64 71b0067b9e9c10266f0ba68d0f249455cc118c35 https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 From bf2052285d5064b2f9886384f1e4e90f35737da8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:10:38 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 62 +++++++++++++++++----------------- go.sum | 104 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index ab77c0e6a0..6a3e2bffdc 100644 --- a/go.mod +++ b/go.mod @@ -219,36 +219,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240625195430-733cc9d44d7c // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240625195430-733cc9d44d7c // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240701115107-421e90ed9ef0 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes ) replace ( @@ -259,4 +259,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes diff --git a/go.sum b/go.sum index 1fe441c74c..510d664818 100644 --- a/go.sum +++ b/go.sum @@ -467,60 +467,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:dth3HGSUg52NBfrClZuu584PNgACrrDWtTBeUhFyU+A= github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= -github.com/openshift/kubernetes v0.0.0-20240625195430-733cc9d44d7c h1:Pzj34XUNNU5LGpUYqW7IXLqt+MbMutvq9aO9qzpe8dg= -github.com/openshift/kubernetes v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= +github.com/openshift/kubernetes v0.0.0-20240701115107-421e90ed9ef0 h1:vu+mqP5NAcJpAHXFiWPtV0q9FdmfGAfVE7kH39eBirk= +github.com/openshift/kubernetes v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 h1:Eq3Ql8dFdv5hvkxKGTxxLb22xcin771AvZj+24HlCI0= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c h1:EcxaNfvcLRPwfMD1lf7xmbCBE8Thep1LKUWMrDxGJT8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c h1:OpfMJIlV3t8yeBUwY6Jaqfun8Q/8apE/ggci4c7yoGE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c h1:iye3T+SMY4Z0PXxAMv3/PXlelPOa12BpE6OREgL3H2E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c h1:MSXUcHv2wGgyzND74vA/X6XDkFpHfQKCCygZOdRy+/Y= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c h1:eq1Z3LtivGdnnqJ7roQoFsykLkyXEu6LL8TyrcqgD4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c h1:qnAEqo6QAh2F9Ei+F4W59nKO7Sk5yp1lDwB69+RZCGg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c h1:Ni6rNADyO/LuwI7qKQBiHPIyuNsUIf8wwf1JldJFsAk= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c h1:PpNQq6MXJ6JR86WnRnHpMJoLA8qlIBwrRnKEQxH76Zw= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c h1:I9ige5xEVz6laGn8tk0UKlZvCKV3IF3pL2psfhXY85E= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c h1:rQDOhceOkcwdLdhH/q7bwJ9n3bXsfIihFODKLnG5fkA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c h1:ENEhSv/KawIYEZD0cDcPOZSuaF+eJFH7pnXWpis6794= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c h1:8bMdzGd9bGq8xpLbVfRSyumci+1YiISVr08XqFSGAZE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c h1:OFuU9uukFeCnPifjfoGP1V4eLy8KROWCsvQPJWj5jus= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c h1:I2QAJoyJOo3rp6zhiVtb++4KinqQVz88pFP5FpkYLKE= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c h1:AKe0NshfXQVjejqmOs8w3E0hVCVBF3+op96PPzCi3eQ= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c h1:3W/1HU4VpqZJo2QBefxPhXcCGJlxtyXneqozibP+TVA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c h1:O/RUzP8ZPQWrRma0LnRyTgDREHYBwRJ6VIWwHoG1QHY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c h1:fSihEMTtMfzcYFeXmlYXnDfCNBc5b4w2D/gUIynAT0Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c h1:DG6rs3S0EnNXxpRny60dECAyzg8jMOFprfAT1pG4qsI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c h1:AZkZbAQcG8dQRLQw/Ue9ptlbp0Hu4/8yKxuDSYWrAE0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c h1:jkhQdP60za1jKU9/PaQOm4JGES+LEU28qxMYWcHyLBY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c h1:WOuWGlDErVdhqxrJ7LuPhVWIOX3Jsr3kY23dQtcFjYY= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c h1:pGcebRrGFTxq4T84zIJYtuh88Az0wpQgqV+OcY5/osw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c h1:q2Fx6US9P8qX0ue7Z4o0+tm57mv4hDA55C9zvOR/TUY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c h1:birnlB13pTwyYfaGOjfLpM7F/wFYMaDulQW4qrlY6Pc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 h1:G7NfmRyo25dusvR5OIaUAx5yy5iRpWrM+LaaVh5jS1I= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 h1:aiTnsEHolVeXZmUPB7dmqwT3cnvd1pMjvOLYOowBb0E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 h1:/3cuQO7842rFYdxQKU5rnvJXzLMDhPoobGJEpsrYnSI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 h1:nDdxFO4SUPpnAyKVjsTSlPmJpLxFNzq/HPOvdYtUgP0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 h1:8djqwVULT7pyPl0Rw8XrDiYF+PFrOmzO5IxQU+7RGnc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 h1:CyncBhjekV9iLUmexQWevQFaIVEmxP8ZOBUjWuwjtS0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 h1:5Ud7587cXyMLMGTqOAB0nYE267so3Ez0NiosgDbfzig= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 h1:a2lNeBkH+22o4Tb6AHpvqJq4/HoedllV6E5JOkcMh94= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 h1:S68QV66pEJjrHLgeDVMh1mMzY5W5E0Xf3zPMR5/+TPY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 h1:cQwCI0oNFsj5QX/qQwQQc5pL4wRqvhHYw5pzzRAjoOY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 h1:swUXYpdXKKk3bIf1nwDbral7OPN1pdKhDaWLjUTJL60= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 h1:pvF9+TwkGL5nXMX+4/FYWcdT5PtRfv/vj353pTM4ZEU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 h1:u0TQrP3mb/fS2veVS6/ymDHs3pYm41TFT1OVctvjRas= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 h1:skBUsoRmglX5r0E6jGmSk1u0L4eb3vwSQAZHxVlgfxo= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 h1:SfKsCFA4vmqFirL80RxOZoMxQvBxwdamSTtML/cDz3M= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 h1:oUFoMZR0scCG2CSXuNqGg13InY8TGjfH/ODw03VLEtI= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 h1:IgLE33o+MOGsKCEQfSsAZhsUJh8U0noAcWacMFLMgOQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 h1:dM1WkdjOzmvLMEYQe7OfdhQoa2BR8c8GvJnBzqQRoMg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 h1:zsM2mA1PZZr7y4u56FdQT7xHxunrfMToENBAxw8JPO0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 h1:z3XffTLPp5uq//9hyViZLCsBmZ1ZY81Au2tYg91MIGk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 h1:GPo90so5pSZZa/MNlLjScHRUsLQdxGUZgrhhkCU8knc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 h1:xH0Jf1HJR+DkQlM6HA8OQmr6IJmUxdlX8jxvtYrax4k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 h1:qQwVsV/PWylk60NTIbomOikLwWe7EAPNOOst29FV9kE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 h1:BxdQSZhBXOWhwQDF94CMxTav+2XqStCS/8If75yPXJ0= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 h1:biR63bb2/kkLSSPE6eKEAiVpZOSz4U7D2YQKI/w8q7U= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0/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 3c0c6599572eaac6734008a24f8ae193de513a3d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:08 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/modules.txt | 114 ++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 7534027caf..f000e37c8f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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-20240625195430-733cc9d44d7c +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240625195430-733cc9d44d7c +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240701115107-421e90ed9ef0 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 From ebdbc7ce13592a463d079cfcf8df50f31c0924b4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:08 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 60 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index ca2c24a035..8edd5aacd0 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,35 +150,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 547ff0dae1..8e9c12fdba 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -200,20 +200,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:i9O8+g github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:hlets2VEeYF+XgTh3LjKq3xe574wlGuGwb+oYZDSjog= github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:gAL0Hw/h7vE2UMP69wEFI2Ze5aHppyOYoHofHdYXVic= github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c h1:EcxaNfvcLRPwfMD1lf7xmbCBE8Thep1LKUWMrDxGJT8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c h1:iye3T+SMY4Z0PXxAMv3/PXlelPOa12BpE6OREgL3H2E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c h1:MSXUcHv2wGgyzND74vA/X6XDkFpHfQKCCygZOdRy+/Y= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c h1:eq1Z3LtivGdnnqJ7roQoFsykLkyXEu6LL8TyrcqgD4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c h1:qnAEqo6QAh2F9Ei+F4W59nKO7Sk5yp1lDwB69+RZCGg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c h1:I9ige5xEVz6laGn8tk0UKlZvCKV3IF3pL2psfhXY85E= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c h1:AZkZbAQcG8dQRLQw/Ue9ptlbp0Hu4/8yKxuDSYWrAE0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 h1:G7NfmRyo25dusvR5OIaUAx5yy5iRpWrM+LaaVh5jS1I= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 h1:/3cuQO7842rFYdxQKU5rnvJXzLMDhPoobGJEpsrYnSI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 h1:nDdxFO4SUPpnAyKVjsTSlPmJpLxFNzq/HPOvdYtUgP0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 h1:8djqwVULT7pyPl0Rw8XrDiYF+PFrOmzO5IxQU+7RGnc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 h1:CyncBhjekV9iLUmexQWevQFaIVEmxP8ZOBUjWuwjtS0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 h1:S68QV66pEJjrHLgeDVMh1mMzY5W5E0Xf3zPMR5/+TPY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 h1:z3XffTLPp5uq//9hyViZLCsBmZ1ZY81Au2tYg91MIGk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0/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 0842d4f2fbd7ddca55518fcd960ca191ba397733 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:14 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 78ca94c2ac..cd1de8b2a0 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 ## 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-20240625195430-733cc9d44d7c +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1056,33 +1056,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240625195430-733cc9d44d7c -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240701115107-421e90ed9ef0 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240701115107-421e90ed9ef0 From 8119afcf7d30fb2da4ab23574fc86aa3ca697ab8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:14 +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 87d4d4c8df..f2b6108241 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:f9f866eb20e69da91892736de3bf6cfad800502094119828137747da8c697ad0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01e7742ab0e3b60003d19027e42dd6996636415f1f83e8df7c6d56d41e5dd849" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 8895bbda6b71e3666b4fd0f7d10018c86042d0e3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:16 +0000 Subject: [PATCH 8/9] update manifests --- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 6 ++--- .../kustomization.aarch64.yaml | 8 +++---- .../kustomization.x86_64.yaml | 10 ++++----- .../release-olm-aarch64.json | 6 ++--- .../release-olm-x86_64.json | 8 +++---- assets/release/release-aarch64.json | 6 ++--- assets/release/release-x86_64.json | 22 +++++++++---------- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 6b72d8cabc..35e3205c15 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:97cae6ad2cbd1cabcda49591f1c87f3782bdeeaf4edf5c7587db046c28741623 + digest: sha256:e3fd630f1665f2d196e402147e4340371edf1f74cd6b883bb67a34392b506c00 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4994621f12f65b54c98bc02d2afa7ff5b23731f7b18faaa643bfe4c45f6738d5 + digest: sha256:f8316dc19d7234fa65d71cb34f5189133169db03fd5f4ced00db872e21f0e7ed diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index d27de1be95..4df0fdcbe7 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-02-155822" + "base": "4.17.0-0.nightly-arm64-2024-07-04-234139" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a80b9a73be66874a92a7a96de6fa43754ef0382aa4b2822c486561ca84fbd097", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index ae196d5afa..4c757af38e 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-01-221530" + "base": "4.17.0-0.nightly-2024-07-04-162615" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97cae6ad2cbd1cabcda49591f1c87f3782bdeeaf4edf5c7587db046c28741623", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4994621f12f65b54c98bc02d2afa7ff5b23731f7b18faaa643bfe4c45f6738d5" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3fd630f1665f2d196e402147e4340371edf1f74cd6b883bb67a34392b506c00", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8316dc19d7234fa65d71cb34f5189133169db03fd5f4ced00db872e21f0e7ed" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 3406b7469a..e62534013c 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:e2d3bf78a9d36257cbe881702718ed7faaa219af162f7b42a46876b775b2d56a + digest: sha256:1941bd8d7ef6c1a3ab80f1dd35840d9e2582ec94c20b1f48f19ec4eea1cdee30 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:adf70130e120c74ccd480f620b0e6af7e258b924ed32e9b12386e952763f9bed + digest: sha256:aed85d3129546007b218777cd827312dbd749b987fa98885bfd8340b03e8541c - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:966b7bbb3d1adc3c4a7db3ab11b52efc35b0b465cee0cd00cb0f6c52e1a14bd0 @@ -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:adf70130e120c74ccd480f620b0e6af7e258b924ed32e9b12386e952763f9bed + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aed85d3129546007b218777cd827312dbd749b987fa98885bfd8340b03e8541c - 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:e2d3bf78a9d36257cbe881702718ed7faaa219af162f7b42a46876b775b2d56a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1941bd8d7ef6c1a3ab80f1dd35840d9e2582ec94c20b1f48f19ec4eea1cdee30 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 4758d06468..676b9ab2f2 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:deb2b743d8ae917b5dd2a327246322a85f8318e6a9d0766f64731694bb117323 + digest: sha256:58b9f044fb8c315bb986b3474043a2c08b148d4c45097eaa93de84c48939cc26 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d8f8929fabb60c4b574647449b2749d607b0695becb1876f74f730d1d7d0a11 + digest: sha256:e41fb96637ba1bb4f8277b16ba0dbe5d5de393eca1032099977a57965f29ec54 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2085d372c91008bfec3a37d9343c59e521c3347b4abe139abb59850adef917ed + digest: sha256:654a304b83015d22c49e5e72dcbe59fd9712355bfe38f35167aa481824b2ad69 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d8f8929fabb60c4b574647449b2749d607b0695becb1876f74f730d1d7d0a11 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e41fb96637ba1bb4f8277b16ba0dbe5d5de393eca1032099977a57965f29ec54 - 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:deb2b743d8ae917b5dd2a327246322a85f8318e6a9d0766f64731694bb117323 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58b9f044fb8c315bb986b3474043a2c08b148d4c45097eaa93de84c48939cc26 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 d08aeeb762..bc8ce0e9c6 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-02-155822" + "base": "4.17.0-0.nightly-arm64-2024-07-04-234139" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2d3bf78a9d36257cbe881702718ed7faaa219af162f7b42a46876b775b2d56a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adf70130e120c74ccd480f620b0e6af7e258b924ed32e9b12386e952763f9bed", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1941bd8d7ef6c1a3ab80f1dd35840d9e2582ec94c20b1f48f19ec4eea1cdee30", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aed85d3129546007b218777cd827312dbd749b987fa98885bfd8340b03e8541c", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:966b7bbb3d1adc3c4a7db3ab11b52efc35b0b465cee0cd00cb0f6c52e1a14bd0" } } 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 1fae0f3799..78bec95546 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-01-221530" + "base": "4.17.0-0.nightly-2024-07-04-162615" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deb2b743d8ae917b5dd2a327246322a85f8318e6a9d0766f64731694bb117323", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d8f8929fabb60c4b574647449b2749d607b0695becb1876f74f730d1d7d0a11", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2085d372c91008bfec3a37d9343c59e521c3347b4abe139abb59850adef917ed" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58b9f044fb8c315bb986b3474043a2c08b148d4c45097eaa93de84c48939cc26", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e41fb96637ba1bb4f8277b16ba0dbe5d5de393eca1032099977a57965f29ec54", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:654a304b83015d22c49e5e72dcbe59fd9712355bfe38f35167aa481824b2ad69" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index edcdf8a2e2..be2600887e 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-02-155822" + "base": "4.17.0-0.nightly-arm64-2024-07-04-234139" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e81a96355014f45d31b8daf5514be8ecb78867c2ca3724ac9f5cea95c2a700d8", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11a776234505460f392cf130b7ad1bf34efe30ea28bdce2b1c16e8d9dd13c107", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81102d69667750462daa9e1cb1898b61d4bb3c87de2b182e86fe36e3b31b15c6", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f79e070a940db55be829c1450d87db4a3335d86f34aa667bed8321ca7e3b43b5", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:152d021fd4e8cb1d7d034d69e60313a916d88c0f0e5cfbc678a2b46260b4ebf9", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:966b7bbb3d1adc3c4a7db3ab11b52efc35b0b465cee0cd00cb0f6c52e1a14bd0", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index fb212cb5d2..76dd094354 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-01-221530" + "base": "4.17.0-0.nightly-2024-07-04-162615" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e05148a5827575d552aa52d3c5e93decea3f0104af815001dca753312517659", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e05907b605fb45efbc0f88987aeaded57f7d2aa7d782e9967bd71632103e9539", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e83efe4c4db75de4a06d0e90e7c96349993cd908a321b39d6bb46f9830f9a3a4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2085d372c91008bfec3a37d9343c59e521c3347b4abe139abb59850adef917ed", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d55d4e56c37b5f70478d1c3f301b4643bb1d45c285bb276082f807cce26df868", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee484be0d6e9fafd0fe785c06eb0099a4975de859ebe52655c6647426f19c5cf", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69343de1703dfb812842b3c99c5233b28f8d893f299cce7b8bb5a2bcd22a1713", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:654a304b83015d22c49e5e72dcbe59fd9712355bfe38f35167aa481824b2ad69", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fd81b131918ef7159dda5afd632c1a3b2b69f5d21322b70fe0bf58d29a1cad6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9f866eb20e69da91892736de3bf6cfad800502094119828137747da8c697ad0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e08c86e4e3727d6a58f48f1c491185ad1a5ee05fd103de1e1b20c0f7a8156b38", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b06e2b692b82b8832925177ebbf0f516d69b64a9f15293fb26b02bbcca9350b5", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01e7742ab0e3b60003d19027e42dd6996636415f1f83e8df7c6d56d41e5dd849", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df1f0c82066cfcbf8038db0feffe76407ef3a52632e7f4d0972e4b3301555d20", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9d1365bfcf470e3f808edcc9688af4544913fa6f4c01d65d0e7d99eeb032144", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f628923b3ec8b3ae92565e4bd75b5308c2c5a9c137cd702c7ad454ea9b48a2", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898f0ebe4474177e7ee514a8952ce8e60ba78b47145ffb1cd77a76e36108e3b7" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46e9e549dd6c20ee73f3508d972b4594209fce5fd056fd4b351002da93abde97", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9160e59fcf06be503ef173678ffacf2002afe9b38bfddeaac79854dba9498163", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91813d019809c275675f20ac89562eb45f31260973823641e7c885a2154aa51d" } } From 1af7026df93bebcf6762690948e581fbe51269bd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 5 Jul 2024 04:11:17 +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 476f1ae8aa..8014e2de7b 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.2 -KUBE_GIT_COMMIT=733cc9d44d7c449f231313a8f158e265afa4b8c6 +KUBE_GIT_COMMIT=421e90ed9ef07c1a797386e662255dfb830a6b9f KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 2d100192ac..bc80641a83 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-02-155822 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-04-234139 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 5cfc1010ba..a0efbe2b1c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-07-01-221530 +OCP_VERSION := 4.17.0-0.nightly-2024-07-04-162615