From ca1e0b73eb427aeaa2c088582d2dc68f1314f253 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:10:47 +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 98b765740a..f3328c2b2a 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-06-25-162526" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-30-162939" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-01-124741" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-01-152414" From fecfcb2b3a42305ec9fe864d7d9cb4c0357a28ca Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:10:47 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 76 ++++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 18 ++++---- 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 744e1668d1..8c3924f3b3 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,77 @@ -- oc image-arm64 34c69c72be5a0c71863965a5c6480c236b0f843e to 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 +- api embedded-component 987b8890c273cdcc262028806fa85ae5ab3ed92f to 0689f006bcdeccf685c75438835beffa8bb14db7 + - d6cbe3b 2024-06-16T13:16:17+03:00 METAL-1038 Remove baremetal dependency on MachineAPI capability + +- cluster-ingress-operator embedded-component 4e621359cea8ef2ae8497101ee3daf9f474b4b66 to b18a07c414696eb01170180d9dc8b5c221909d68 + - dc4e7f9 2024-06-25T09:13:27+02:00 OCPBUGS-28673: Add e2e test for connect timeout + +- cluster-network-operator embedded-component 32e733b32f942ccd823f02ac0a77c52101eaf79e to 4b792c659385948e825d2ba17b8f6d2e5c3acfed + - 3955a9a 2024-06-24T15:54:40+05:30 Set global IP forwarding sysctl parameters while starting ovnkube-controller + +- kubernetes embedded-component d0324787c86dcd13d4f16745da43b216a6787040 to 733cc9d44d7c449f231313a8f158e265afa4b8c6 + - 69330adbe 2024-06-21T13:51:03-04:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - efe876d19 2024-06-21T13:50:32-04:00 UPSTREAM: : manually resolve conflicts + - 39683505b 2024-06-11T20:20:59+00:00 Release commit for Kubernetes v1.30.2 + - 47c36d4bb 2024-06-06T18:18:54+02:00 Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base + - cd73ad187 2024-06-04T23:23:18+00:00 update driver installer + - 654c085cb 2024-06-04T09:04:10+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable + - 1ddcf3486 2024-06-04T09:02:07+00:00 Revert "scheduler: preallocation for NodeToStatusMap" + - 0df726772 2024-06-03T08:12:16+03:00 kubeadm: use the actual configured kubelet healthz address:port + - 398ab938e 2024-05-23T12:07:42+03:00 kubectl create cronjobs: Manually set OwnerReferences + - 42b93b35b 2024-05-22T10:41:21+08:00 add an integration test when nodeAffinity specifies a non-existent node. + - f73bb17ef 2024-05-22T10:41:21+08:00 base on allNodes when calculating nextStartNodeIndex + - a26f2c59e 2024-05-16T11:59:44-04:00 Fix printPod panic with spurious container statuses + - 85fc47582 2024-05-14T11:10:45+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.1 + - 3d8967247 2024-05-13T17:34:08+00:00 Adding the feature gates to fix cost for VAP and webhook matchConditions. + - b762a187f 2024-05-13T11:04:47+00:00 cherry pick #124618 to 1.30 + - 1c8b0f697 2024-05-13T11:11:59+02:00 fix requests tracker concurrency + - 2956e294c 2024-05-13T11:11:59+02:00 fix conflict race in statefulset rest update + - 7d9b913d1 2024-05-13T11:11:58+02:00 fix stateful set pod recreation and event spam + - a58d4f54c 2024-05-13T11:11:58+02:00 fix pods tracking and internal error checking in statefulset tests + - f20b6672b 2024-05-12T15:30:58+02:00 [go] Bump images, dependencies and versions to go 1.22.3 and distroless iptables + - d8c37e815 2024-05-11T01:18:51+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year + +- machine-config-operator embedded-component 58aca6909f9d1c319816dc12beedc35150418e40 to 444decb1dfd1ebb3fb7c2e5a96ff3b3d53b6f492 + - 51c2df2b 2024-06-25T16:58:38-04:00 daemon/update: add workaround for OCPBUGS-33694 + - ff37e274 2024-06-25T16:58:38-04:00 daemon/update: disable systemd unit before overwriting + - 1092da0f 2024-06-25T12:17:50-04:00 remove this unnecessary test + - 52e76fec 2024-06-25T13:31:47+02:00 daemon: Handle correctly OS Version for 4.1 and 4.2 bootimages + - 4d0502c8 2024-05-29T21:42:57+05:30 Modify auto tuned system reserved cpu recommendation + - a5bbee36 2024-05-29T21:41:15+05:30 Introduce versioning for Auto Node Sizing feature + +- operator-framework-olm embedded-component 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61 to 0b14e86bcc2368a4d0201f8de7ea322f11e6f236 + - 59c52546 2024-06-27T10:26:38-05:00 switch base image + - 5274dd9c 2024-06-27T00:03:56+00:00 build(deps): bump k8s.io/component-base from 0.30.1 to 0.30.2 (#3320) (#3293) + - 9d757815 2024-06-27T00:02:31+00:00 drop --show-node-events from e2e call (#3331) + - 50ccd407 2024-06-27T00:02:17+00:00 make flake attempts an optional parameter (#3330) + - bb9eff24 2024-06-27T00:02:02+00:00 Bump kubeapis to 0.30.2 (#3329) + - 20de5942 2024-06-27T00:01:46+00:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + +- oc image-amd64 34c69c72be5a0c71863965a5c6480c236b0f843e to 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 - 6210a4a5 2024-06-25T12:05:49-07:00 pkg/cli/admin/prune/renderedmachineconfigs: 'Error dry-run deleting' +- ovn-kubernetes image-amd64 56c123fe65143eb4005558d9845c89d243c8573c to 1356c9b67dc0f07b71537117f1fce09a34b9b5cf + - 84b72abb 2024-05-25T16:06:38+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ovn-kubernetes-microshift.yml + +- kubernetes image-amd64 d0324787c86dcd13d4f16745da43b216a6787040 to 733cc9d44d7c449f231313a8f158e265afa4b8c6 + - 69330adbe 2024-06-21T13:51:03-04:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - efe876d19 2024-06-21T13:50:32-04:00 UPSTREAM: : manually resolve conflicts + - 39683505b 2024-06-11T20:20:59+00:00 Release commit for Kubernetes v1.30.2 + - 47c36d4bb 2024-06-06T18:18:54+02:00 Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base + - cd73ad187 2024-06-04T23:23:18+00:00 update driver installer + - 654c085cb 2024-06-04T09:04:10+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable + - 1ddcf3486 2024-06-04T09:02:07+00:00 Revert "scheduler: preallocation for NodeToStatusMap" + - 0df726772 2024-06-03T08:12:16+03:00 kubeadm: use the actual configured kubelet healthz address:port + - 398ab938e 2024-05-23T12:07:42+03:00 kubectl create cronjobs: Manually set OwnerReferences + - 42b93b35b 2024-05-22T10:41:21+08:00 add an integration test when nodeAffinity specifies a non-existent node. + - f73bb17ef 2024-05-22T10:41:21+08:00 base on allNodes when calculating nextStartNodeIndex + - a26f2c59e 2024-05-16T11:59:44-04:00 Fix printPod panic with spurious container statuses + - 85fc47582 2024-05-14T11:10:45+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.1 + - 3d8967247 2024-05-13T17:34:08+00:00 Adding the feature gates to fix cost for VAP and webhook matchConditions. + - b762a187f 2024-05-13T11:04:47+00:00 cherry pick #124618 to 1.30 + - 1c8b0f697 2024-05-13T11:11:59+02:00 fix requests tracker concurrency + - 2956e294c 2024-05-13T11:11:59+02:00 fix conflict race in statefulset rest update + - 7d9b913d1 2024-05-13T11:11:58+02:00 fix stateful set pod recreation and event spam + - a58d4f54c 2024-05-13T11:11:58+02:00 fix pods tracking and internal error checking in statefulset tests + - f20b6672b 2024-05-12T15:30:58+02:00 [go] Bump images, dependencies and versions to go 1.22.3 and distroless iptables + - d8c37e815 2024-05-11T01:18:51+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 601c00a156..02b73a41c9 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,31 +1,31 @@ -https://github.com/openshift/api embedded-component 987b8890c273cdcc262028806fa85ae5ab3ed92f +https://github.com/openshift/api embedded-component 0689f006bcdeccf685c75438835beffa8bb14db7 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 4e621359cea8ef2ae8497101ee3daf9f474b4b66 +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 32e733b32f942ccd823f02ac0a77c52101eaf79e +https://github.com/openshift/cluster-network-operator embedded-component 4b792c659385948e825d2ba17b8f6d2e5c3acfed 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 d0324787c86dcd13d4f16745da43b216a6787040 +https://github.com/openshift/kubernetes embedded-component 733cc9d44d7c449f231313a8f158e265afa4b8c6 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 58aca6909f9d1c319816dc12beedc35150418e40 +https://github.com/openshift/machine-config-operator embedded-component 444decb1dfd1ebb3fb7c2e5a96ff3b3d53b6f492 https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6 -https://github.com/openshift/operator-framework-olm embedded-component 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61 +https://github.com/openshift/operator-framework-olm embedded-component 0b14e86bcc2368a4d0201f8de7ea322f11e6f236 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 34c69c72be5a0c71863965a5c6480c236b0f843e +https://github.com/openshift/oc image-amd64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 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 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 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 56c123fe65143eb4005558d9845c89d243c8573c -https://github.com/openshift/kubernetes image-amd64 d0324787c86dcd13d4f16745da43b216a6787040 +https://github.com/openshift/ovn-kubernetes image-amd64 1356c9b67dc0f07b71537117f1fce09a34b9b5cf +https://github.com/openshift/kubernetes image-amd64 733cc9d44d7c449f231313a8f158e265afa4b8c6 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-arm64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3 https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d From 9208fbb1999c7566332aad8906703cb96fce0342 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:11:30 +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 3534f8351f..ab77c0e6a0 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-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d // 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 ) 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-20240621193825-d0324787c86d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes diff --git a/go.sum b/go.sum index b1f00bac5c..1fe441c74c 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-20240621193825-d0324787c86d h1:QHiqhfLia95bhESQidjfnuFDmdH9amaAard802LkSh4= -github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= +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-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-20240621193825-d0324787c86d h1:iG3mzyPQQ4B98xnvBJi+hkOFDOu8JBjt5LOGJ4C2F1U= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d h1:wfzfg25LxVeJwk6DHWzIjpuf/VNMWLr1eZHEwdoEf9Q= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d h1:k1q2PqvFtKgmMKFTZmB+Lb0oq3YFRsAWAIHgV+KB7fw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d h1:A30h5YO6B4LyJz61YopJliXmcbGcbdJFJdqqCwlpKlk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d h1:O/hq1RMY7fMA1c5ZDjykotYKjP007qnKvGCVFlet2PU= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d h1:pqfmw3HdQ9pceULJGSQGPWXitZ0jF2UGNobizb5/+zM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d h1:nNJgxSdpAwqh/HomlOdyTo6O8LOe5q9iUbF0WG+y+4s= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d h1:I1D1lSVWqFa5ZibpCI+I6TLUGl4wgK4YF8mR8QojFZw= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d h1:hbE7QtUDO7Q/825t/7G3RTp5j53n1bq9bT9LhDduCUA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d h1:1EHpeoSFpFjRalIx0EfOAjDiievSoJOiL39TSl75Kms= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d h1:iIlu22abHE+AD9H18+emMFtLAincK33Vr3tytT/bLI0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d h1:1BWrGJH4WxnVf4vfAzwq3iUxIT/jhhdgoZQUE7t1nQI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d h1:qtDyiOXq0+4XokoEG9QSbWKhUHvQCX6sDlEuc/5BNLY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d h1:XQPFaNWSSRaKpxX84jKKkEGAZNs1gvlFHm7HcVnzmTA= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d h1:l52lS9KBxE/28E/y21NCwMlXafCzVlSgeueJFDMrRFM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d h1:o57Xt+HOpJhDtm2N7rlz+fr4NZpNty8ZhPAR/4TlFVA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d h1:mUvC5Bh7zoe9lDGqeyxS2l0luFcBQWTm7kyw4S9ZkC4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d h1:JeNrCorD42EVrC6XirtiXQ6MSYN4sgc1kpZSMf9GwEA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d h1:BGqfT/7J3ah4Wd1wHioiGhmWDJXb16mKi3tVSyNUiow= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d h1:oOL8X2jNCrE7iVEzCCeCKOxHLNa/IJhwHFcqXgc7ga0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d h1:7Vmy8zNEXUOl/99SZHatipmhHzN0arcwEtJ1JOHA3YE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d h1:4SkVJMTCc2xJMypSvmQS7rzELaqSIrOCoKzBMrh4xBU= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d h1:h5Pg7NcC/cm0w3G1XTQ1uahVl8kUriVAqXBOjcnKo48= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d h1:ciqASem8kqk5C37emywMDM/YZr7kM6/ajIERGYJ6phA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d h1:bRjMHnUjkKBKvBI4koRPshF2LSGohvinHLeqt/xQD0k= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +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/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 45ffb164a690ca1cd296557efb3996bf50847a50 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:21 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../apiextensions/validation/validation.go | 6 +- .../pkg/apiserver/schema/cel/validation.go | 3 +- .../pkg/admission/plugin/cel/compile.go | 64 +++++----- .../pkg/admission/plugin/cel/interface.go | 4 +- .../plugin/policy/validating/plugin.go | 27 ++++- .../plugin/policy/validating/typechecking.go | 5 +- .../pkg/admission/plugin/webhook/accessors.go | 12 ++ .../plugin/webhook/generic/webhook.go | 6 +- .../apis/apiserver/validation/validation.go | 6 +- .../apiserver/pkg/cel/environment/base.go | 47 ++++++-- .../apiserver/pkg/features/kube_features.go | 22 ++++ .../structured/namedresources/cel/compile.go | 3 +- .../validation/validation.go | 43 +++++-- .../controller/statefulset/stateful_set.go | 4 +- .../statefulset/stateful_set_control.go | 43 ++----- .../kubernetes/pkg/features/kube_features.go | 4 + .../pkg/printers/internalversion/printers.go | 3 + .../pkg/scheduler/framework/interface.go | 4 +- .../framework/preemption/preemption.go | 17 +-- .../pkg/scheduler/framework/types.go | 4 +- .../internal/queue/scheduling_queue.go | 5 + .../kubernetes/pkg/scheduler/schedule_one.go | 23 ++-- .../k8s.io/kubernetes/pkg/volume/plugins.go | 2 +- vendor/modules.txt | 114 +++++++++--------- 24 files changed, 292 insertions(+), 179 deletions(-) diff --git a/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go b/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go index 970a6519c1..7133776fbb 100644 --- a/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go +++ b/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go @@ -92,7 +92,8 @@ func ValidateCustomResourceDefinition(ctx context.Context, obj *apiextensions.Cu requirePrunedDefaults: true, requireAtomicSetType: true, requireMapListKeysMapSetValidation: true, - celEnvironmentSet: environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()), + // strictCost is always true to enforce cost limits. + celEnvironmentSet: environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true), } allErrs := genericvalidation.ValidateObjectMeta(&obj.ObjectMeta, false, nameValidationFn, field.NewPath("metadata")) @@ -231,7 +232,8 @@ func ValidateCustomResourceDefinitionUpdate(ctx context.Context, obj, oldObj *ap requireMapListKeysMapSetValidation: requireMapListKeysMapSetValidation(&oldObj.Spec), preexistingExpressions: findPreexistingExpressions(&oldObj.Spec), versionsWithUnchangedSchemas: findVersionsWithUnchangedSchemas(obj, oldObj), - celEnvironmentSet: environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()), + // strictCost is always true to enforce cost limits. + celEnvironmentSet: environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true), } return validateCustomResourceDefinitionUpdate(ctx, obj, oldObj, opts) } diff --git a/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go b/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go index b4c8afa9af..d9b595805b 100644 --- a/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go +++ b/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go @@ -90,7 +90,8 @@ func NewValidator(s *schema.Structural, isResourceRoot bool, perCallLimit uint64 // exist. declType is expected to be a CEL DeclType corresponding to the structural schema. // perCallLimit was added for testing purpose only. Callers should always use const PerCallLimit from k8s.io/apiserver/pkg/apis/cel/config.go as input. func validator(s *schema.Structural, isResourceRoot bool, declType *cel.DeclType, perCallLimit uint64) *Validator { - compiledRules, err := Compile(s, declType, perCallLimit, environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()), StoredExpressionsEnvLoader()) + // strictCost is always true to enforce cost limits. + compiledRules, err := Compile(s, declType, perCallLimit, environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true), StoredExpressionsEnvLoader()) var itemsValidator, additionalPropertiesValidator *Validator var propertiesValidators map[string]Validator if s.Items != nil { diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/compile.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/compile.go index b7b589d273..bb5e233d45 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/compile.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/compile.go @@ -222,40 +222,48 @@ func (c compiler) CompileCELExpression(expressionAccessor ExpressionAccessor, op func mustBuildEnvs(baseEnv *environment.EnvSet) variableDeclEnvs { requestType := BuildRequestType() namespaceType := BuildNamespaceType() - envs := make(variableDeclEnvs, 4) // since the number of variable combinations is small, pre-build a environment for each + envs := make(variableDeclEnvs, 8) // since the number of variable combinations is small, pre-build a environment for each for _, hasParams := range []bool{false, true} { for _, hasAuthorizer := range []bool{false, true} { - var envOpts []cel.EnvOption - if hasParams { - envOpts = append(envOpts, cel.Variable(ParamsVarName, cel.DynType)) - } - if hasAuthorizer { + for _, strictCost := range []bool{false, true} { + var envOpts []cel.EnvOption + if hasParams { + envOpts = append(envOpts, cel.Variable(ParamsVarName, cel.DynType)) + } + if hasAuthorizer { + envOpts = append(envOpts, + cel.Variable(AuthorizerVarName, library.AuthorizerType), + cel.Variable(RequestResourceAuthorizerVarName, library.ResourceCheckType)) + } envOpts = append(envOpts, - cel.Variable(AuthorizerVarName, library.AuthorizerType), - cel.Variable(RequestResourceAuthorizerVarName, library.ResourceCheckType)) - } - envOpts = append(envOpts, - cel.Variable(ObjectVarName, cel.DynType), - cel.Variable(OldObjectVarName, cel.DynType), - cel.Variable(NamespaceVarName, namespaceType.CelType()), - cel.Variable(RequestVarName, requestType.CelType())) + cel.Variable(ObjectVarName, cel.DynType), + cel.Variable(OldObjectVarName, cel.DynType), + cel.Variable(NamespaceVarName, namespaceType.CelType()), + cel.Variable(RequestVarName, requestType.CelType())) - extended, err := baseEnv.Extend( - environment.VersionedOptions{ - // Feature epoch was actually 1.26, but we artificially set it to 1.0 because these - // options should always be present. - IntroducedVersion: version.MajorMinor(1, 0), - EnvOptions: envOpts, - DeclTypes: []*apiservercel.DeclType{ - namespaceType, - requestType, + extended, err := baseEnv.Extend( + environment.VersionedOptions{ + // Feature epoch was actually 1.26, but we artificially set it to 1.0 because these + // options should always be present. + IntroducedVersion: version.MajorMinor(1, 0), + EnvOptions: envOpts, + DeclTypes: []*apiservercel.DeclType{ + namespaceType, + requestType, + }, }, - }, - ) - if err != nil { - panic(fmt.Sprintf("environment misconfigured: %v", err)) + ) + if err != nil { + panic(fmt.Sprintf("environment misconfigured: %v", err)) + } + if strictCost { + extended, err = extended.Extend(environment.StrictCostOpt) + if err != nil { + panic(fmt.Sprintf("environment misconfigured: %v", err)) + } + } + envs[OptionalVariableDeclarations{HasParams: hasParams, HasAuthorizer: hasAuthorizer, StrictCost: strictCost}] = extended } - envs[OptionalVariableDeclarations{HasParams: hasParams, HasAuthorizer: hasAuthorizer}] = extended } } return envs diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go index c9f4e63369..ae61dc826c 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go @@ -57,10 +57,12 @@ type OptionalVariableDeclarations struct { // HasParams specifies if the "params" variable is declared. // The "params" variable may still be bound to "null" when declared. HasParams bool - // HasAuthorizer specifies if the"authorizer" and "authorizer.requestResource" + // HasAuthorizer specifies if the "authorizer" and "authorizer.requestResource" // variables are declared. When declared, the authorizer variables are // expected to be non-null. HasAuthorizer bool + // StrictCost specifies if the CEL cost limitation is strict for extended libraries as well as native libraries. + StrictCost bool } // FilterCompiler contains a function to assist with converting types and values to/from CEL-typed values. diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/plugin.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/plugin.go index c286cffbdc..fb097737a8 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/plugin.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/plugin.go @@ -31,6 +31,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/cel/environment" "k8s.io/apiserver/pkg/features" + utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/dynamic" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" @@ -43,13 +44,21 @@ const ( ) var ( - compositionEnvTemplate *cel.CompositionEnv = func() *cel.CompositionEnv { - compositionEnvTemplate, err := cel.NewCompositionEnv(cel.VariablesTypeName, environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) + compositionEnvTemplateWithStrictCost *cel.CompositionEnv = func() *cel.CompositionEnv { + compositionEnvTemplateWithStrictCost, err := cel.NewCompositionEnv(cel.VariablesTypeName, environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true)) if err != nil { panic(err) } - return compositionEnvTemplate + return compositionEnvTemplateWithStrictCost + }() + compositionEnvTemplateWithoutStrictCost *cel.CompositionEnv = func() *cel.CompositionEnv { + compositionEnvTemplateWithoutStrictCost, err := cel.NewCompositionEnv(cel.VariablesTypeName, environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), false)) + if err != nil { + panic(err) + } + + return compositionEnvTemplateWithoutStrictCost }() ) @@ -114,12 +123,18 @@ func compilePolicy(policy *Policy) Validator { if policy.Spec.ParamKind != nil { hasParam = true } - optionalVars := cel.OptionalVariableDeclarations{HasParams: hasParam, HasAuthorizer: true} - expressionOptionalVars := cel.OptionalVariableDeclarations{HasParams: hasParam, HasAuthorizer: false} + strictCost := utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForVAP) + optionalVars := cel.OptionalVariableDeclarations{HasParams: hasParam, HasAuthorizer: true, StrictCost: strictCost} + expressionOptionalVars := cel.OptionalVariableDeclarations{HasParams: hasParam, HasAuthorizer: false, StrictCost: strictCost} failurePolicy := policy.Spec.FailurePolicy var matcher matchconditions.Matcher = nil matchConditions := policy.Spec.MatchConditions - + var compositionEnvTemplate *cel.CompositionEnv + if strictCost { + compositionEnvTemplate = compositionEnvTemplateWithStrictCost + } else { + compositionEnvTemplate = compositionEnvTemplateWithoutStrictCost + } filterCompiler := cel.NewCompositedCompilerFromTemplate(compositionEnvTemplate) filterCompiler.CompileAndStoreVariables(convertv1beta1Variables(policy.Spec.Variables), optionalVars, environment.StoredExpressions) diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go index 16184b4bad..192be9621b 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go @@ -39,6 +39,8 @@ import ( "k8s.io/apiserver/pkg/cel/library" "k8s.io/apiserver/pkg/cel/openapi" "k8s.io/apiserver/pkg/cel/openapi/resolver" + "k8s.io/apiserver/pkg/features" + utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" ) @@ -210,6 +212,7 @@ func (c *TypeChecker) CheckExpression(ctx *TypeCheckingContext, expression strin options := plugincel.OptionalVariableDeclarations{ HasParams: ctx.paramDeclType != nil, HasAuthorizer: true, + StrictCost: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForVAP), } compiler.CompileAndStoreVariables(convertv1beta1Variables(ctx.variables), options, environment.StoredExpressions) result := compiler.CompileCELExpression(celExpression(expression), options, environment.StoredExpressions) @@ -391,7 +394,7 @@ func (c *TypeChecker) tryRefreshRESTMapper() { } func buildEnvSet(hasParams bool, hasAuthorizer bool, types typeOverwrite) (*environment.EnvSet, error) { - baseEnv := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()) + baseEnv := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForVAP)) requestType := plugincel.BuildRequestType() namespaceType := plugincel.BuildNamespaceType() diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/accessors.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/accessors.go index e60d245a62..f23580cc09 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/accessors.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/accessors.go @@ -27,6 +27,8 @@ import ( "k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace" "k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object" "k8s.io/apiserver/pkg/cel/environment" + "k8s.io/apiserver/pkg/features" + utilfeature "k8s.io/apiserver/pkg/util/feature" webhookutil "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/rest" ) @@ -139,11 +141,16 @@ func (m *mutatingWebhookAccessor) GetCompiledMatcher(compiler cel.FilterCompiler Expression: matchCondition.Expression, } } + strictCost := false + if utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks) { + strictCost = true + } m.compiledMatcher = matchconditions.NewMatcher(compiler.Compile( expressions, cel.OptionalVariableDeclarations{ HasParams: false, HasAuthorizer: true, + StrictCost: strictCost, }, environment.StoredExpressions, ), m.FailurePolicy, "webhook", "admit", m.Name) @@ -267,11 +274,16 @@ func (v *validatingWebhookAccessor) GetCompiledMatcher(compiler cel.FilterCompil Expression: matchCondition.Expression, } } + strictCost := false + if utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks) { + strictCost = true + } v.compiledMatcher = matchconditions.NewMatcher(compiler.Compile( expressions, cel.OptionalVariableDeclarations{ HasParams: false, HasAuthorizer: true, + StrictCost: strictCost, }, environment.StoredExpressions, ), v.FailurePolicy, "webhook", "validating", v.Name) diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go index 6a513f1c11..f067b3f723 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go @@ -21,7 +21,6 @@ import ( "fmt" "io" - admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" "k8s.io/klog/v2" admissionv1 "k8s.io/api/admission/v1" @@ -31,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" genericadmissioninit "k8s.io/apiserver/pkg/admission/initializer" + admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" "k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/webhook" "k8s.io/apiserver/pkg/admission/plugin/webhook/config" @@ -39,6 +39,8 @@ import ( "k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/rules" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/cel/environment" + "k8s.io/apiserver/pkg/features" + utilfeature "k8s.io/apiserver/pkg/util/feature" webhookutil "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" @@ -100,7 +102,7 @@ func NewWebhook(handler *admission.Handler, configFile io.Reader, sourceFactory namespaceMatcher: &namespace.Matcher{}, objectMatcher: &object.Matcher{}, dispatcher: dispatcherFactory(&cm), - filterCompiler: cel.NewFilterCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())), + filterCompiler: cel.NewFilterCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks))), }, nil } diff --git a/vendor/k8s.io/apiserver/pkg/apis/apiserver/validation/validation.go b/vendor/k8s.io/apiserver/pkg/apis/apiserver/validation/validation.go index 35ee8a4503..471eb4a741 100644 --- a/vendor/k8s.io/apiserver/pkg/apis/apiserver/validation/validation.go +++ b/vendor/k8s.io/apiserver/pkg/apis/apiserver/validation/validation.go @@ -91,7 +91,8 @@ func CompileAndValidateJWTAuthenticator(authenticator api.JWTAuthenticator, disa func validateJWTAuthenticator(authenticator api.JWTAuthenticator, fldPath *field.Path, disallowedIssuers sets.Set[string], structuredAuthnFeatureEnabled bool) (authenticationcel.CELMapper, field.ErrorList) { var allErrs field.ErrorList - compiler := authenticationcel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) + // strictCost is set to true which enables the strict cost for CEL validation. + compiler := authenticationcel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true)) state := &validationState{} allErrs = append(allErrs, validateIssuer(authenticator.Issuer, disallowedIssuers, fldPath.Child("issuer"))...) @@ -722,7 +723,8 @@ func compileMatchConditions(matchConditions []api.WebhookMatchCondition, fldPath return nil, allErrs } - compiler := authorizationcel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) + // strictCost is set to true which enables the strict cost for CEL validation. + compiler := authorizationcel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true)) seenExpressions := sets.NewString() var compilationResults []authorizationcel.CompilationResult diff --git a/vendor/k8s.io/apiserver/pkg/cel/environment/base.go b/vendor/k8s.io/apiserver/pkg/cel/environment/base.go index eead181317..50ec532665 100644 --- a/vendor/k8s.io/apiserver/pkg/cel/environment/base.go +++ b/vendor/k8s.io/apiserver/pkg/cel/environment/base.go @@ -46,7 +46,9 @@ func DefaultCompatibilityVersion() *version.Version { return version.MajorMinor(1, 29) } -var baseOpts = []VersionedOptions{ +var baseOpts = append(baseOptsWithoutStrictCost, StrictCostOpt) + +var baseOptsWithoutStrictCost = []VersionedOptions{ { // CEL epoch was actually 1.23, but we artificially set it to 1.0 because these // options should always be present. @@ -132,6 +134,14 @@ var baseOpts = []VersionedOptions{ }, } +var StrictCostOpt = VersionedOptions{ + // This is to configure the cost calculation for extended libraries + IntroducedVersion: version.MajorMinor(1, 0), + ProgramOptions: []cel.ProgramOption{ + cel.CostTracking(&library.CostEstimator{}), + }, +} + // MustBaseEnvSet returns the common CEL base environments for Kubernetes for Version, or panics // if the version is nil, or does not have major and minor components. // @@ -141,7 +151,8 @@ var baseOpts = []VersionedOptions{ // The returned environment contains no CEL variable definitions or custom type declarations and // should be extended to construct environments with the appropriate variable definitions, // type declarations and any other needed configuration. -func MustBaseEnvSet(ver *version.Version) *EnvSet { +// strictCost is used to determine whether to enforce strict cost calculation for CEL expressions. +func MustBaseEnvSet(ver *version.Version, strictCost bool) *EnvSet { if ver == nil { panic("version must be non-nil") } @@ -149,19 +160,33 @@ func MustBaseEnvSet(ver *version.Version) *EnvSet { panic(fmt.Sprintf("version must contain an major and minor component, but got: %s", ver.String())) } key := strconv.FormatUint(uint64(ver.Major()), 10) + "." + strconv.FormatUint(uint64(ver.Minor()), 10) - if entry, ok := baseEnvs.Load(key); ok { - return entry.(*EnvSet) + var entry interface{} + if strictCost { + if entry, ok := baseEnvs.Load(key); ok { + return entry.(*EnvSet) + } + entry, _, _ = baseEnvsSingleflight.Do(key, func() (interface{}, error) { + entry := mustNewEnvSet(ver, baseOpts) + baseEnvs.Store(key, entry) + return entry, nil + }) + } else { + if entry, ok := baseEnvsWithOption.Load(key); ok { + return entry.(*EnvSet) + } + entry, _, _ = baseEnvsWithOptionSingleflight.Do(key, func() (interface{}, error) { + entry := mustNewEnvSet(ver, baseOptsWithoutStrictCost) + baseEnvsWithOption.Store(key, entry) + return entry, nil + }) } - entry, _, _ := baseEnvsSingleflight.Do(key, func() (interface{}, error) { - entry := mustNewEnvSet(ver, baseOpts) - baseEnvs.Store(key, entry) - return entry, nil - }) return entry.(*EnvSet) } var ( - baseEnvs = sync.Map{} - baseEnvsSingleflight = &singleflight.Group{} + baseEnvs = sync.Map{} + baseEnvsWithOption = sync.Map{} + baseEnvsSingleflight = &singleflight.Group{} + baseEnvsWithOptionSingleflight = &singleflight.Group{} ) diff --git a/vendor/k8s.io/apiserver/pkg/features/kube_features.go b/vendor/k8s.io/apiserver/pkg/features/kube_features.go index dbd41b8c5f..bae04d9545 100644 --- a/vendor/k8s.io/apiserver/pkg/features/kube_features.go +++ b/vendor/k8s.io/apiserver/pkg/features/kube_features.go @@ -220,6 +220,24 @@ const ( // if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries. RetryGenerateName featuregate.Feature = "RetryGenerateName" + // owner: @cici37 + // alpha: v1.30 + // + // StrictCostEnforcementForVAP is used to apply strict CEL cost validation for ValidatingAdmissionPolicy. + // It will be set to off by default for certain time of period to prevent the impact on the existing users. + // It is strongly recommended to enable this feature gate as early as possible. + // The strict cost is specific for the extended libraries whose cost defined under k8s/apiserver/pkg/cel/library. + StrictCostEnforcementForVAP featuregate.Feature = "StrictCostEnforcementForVAP" + + // owner: @cici37 + // alpha: v1.30 + // + // StrictCostEnforcementForWebhooks is used to apply strict CEL cost validation for matchConditions in Webhooks. + // It will be set to off by default for certain time of period to prevent the impact on the existing users. + // It is strongly recommended to enable this feature gate as early as possible. + // The strict cost is specific for the extended libraries whose cost defined under k8s/apiserver/pkg/cel/library. + StrictCostEnforcementForWebhooks featuregate.Feature = "StrictCostEnforcementForWebhooks" + // owner: @caesarxuchao @roycaihw // alpha: v1.20 // @@ -347,6 +365,10 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, + StrictCostEnforcementForVAP: {Default: false, PreRelease: featuregate.Beta}, + + StrictCostEnforcementForWebhooks: {Default: false, PreRelease: featuregate.Beta}, + StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta}, StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta}, diff --git a/vendor/k8s.io/dynamic-resource-allocation/structured/namedresources/cel/compile.go b/vendor/k8s.io/dynamic-resource-allocation/structured/namedresources/cel/compile.go index 755dcbff10..d4beb0ce69 100644 --- a/vendor/k8s.io/dynamic-resource-allocation/structured/namedresources/cel/compile.go +++ b/vendor/k8s.io/dynamic-resource-allocation/structured/namedresources/cel/compile.go @@ -184,7 +184,8 @@ func (c CompilationResult) Evaluate(ctx context.Context, attributes []resourceap } func mustBuildEnv() *environment.EnvSet { - envset := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()) + // strictCost is always true to enforce cost limits. + envset := environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true) versioned := []environment.VersionedOptions{ { // Feature epoch was actually 1.30, but we artificially set it to 1.0 because these diff --git a/vendor/k8s.io/kubernetes/pkg/apis/admissionregistration/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/apis/admissionregistration/validation/validation.go index 4695b29eea..60ab6f1fa2 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/admissionregistration/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/admissionregistration/validation/validation.go @@ -35,6 +35,8 @@ import ( "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/cel" "k8s.io/apiserver/pkg/cel/environment" + "k8s.io/apiserver/pkg/features" + utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/util/jsonpath" @@ -221,6 +223,7 @@ func ValidateValidatingWebhookConfiguration(e *admissionregistration.ValidatingW requireRecognizedAdmissionReviewVersion: true, requireUniqueWebhookNames: true, allowInvalidLabelValueInSelector: false, + strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks), }) } @@ -250,6 +253,7 @@ func ValidateMutatingWebhookConfiguration(e *admissionregistration.MutatingWebho requireRecognizedAdmissionReviewVersion: true, requireUniqueWebhookNames: true, allowInvalidLabelValueInSelector: false, + strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks), }) } @@ -261,6 +265,7 @@ type validationOptions struct { requireUniqueWebhookNames bool allowInvalidLabelValueInSelector bool preexistingExpressions preexistingExpressions + strictCostEnforcement bool } type preexistingExpressions struct { @@ -687,6 +692,7 @@ func ValidateValidatingWebhookConfigurationUpdate(newC, oldC *admissionregistrat requireUniqueWebhookNames: validatingHasUniqueWebhookNames(oldC.Webhooks), allowInvalidLabelValueInSelector: validatingWebhookHasInvalidLabelValueInSelector(oldC.Webhooks), preexistingExpressions: findValidatingPreexistingExpressions(oldC), + strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks), }) } @@ -700,6 +706,7 @@ func ValidateMutatingWebhookConfigurationUpdate(newC, oldC *admissionregistratio requireUniqueWebhookNames: mutatingHasUniqueWebhookNames(oldC.Webhooks), allowInvalidLabelValueInSelector: mutatingWebhookHasInvalidLabelValueInSelector(oldC.Webhooks), preexistingExpressions: findMutatingPreexistingExpressions(oldC), + strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForWebhooks), }) } @@ -713,7 +720,7 @@ const ( // ValidateValidatingAdmissionPolicy validates a ValidatingAdmissionPolicy before creation. func ValidateValidatingAdmissionPolicy(p *admissionregistration.ValidatingAdmissionPolicy) field.ErrorList { - return validateValidatingAdmissionPolicy(p, validationOptions{ignoreMatchConditions: false}) + return validateValidatingAdmissionPolicy(p, validationOptions{ignoreMatchConditions: false, strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForVAP)}) } func validateValidatingAdmissionPolicy(p *admissionregistration.ValidatingAdmissionPolicy, opts validationOptions) field.ErrorList { @@ -728,7 +735,7 @@ func validateValidatingAdmissionPolicySpec(meta metav1.ObjectMeta, spec *admissi getCompiler := func() plugincel.Compiler { if compiler == nil { needsComposition := len(spec.Variables) > 0 - compiler = createCompiler(needsComposition) + compiler = createCompiler(needsComposition, opts.strictCostEnforcement) } return compiler } @@ -973,6 +980,7 @@ func validateVariable(compiler plugincel.Compiler, v *admissionregistration.Vari result := compiler.CompileAndStoreVariable(variable, plugincel.OptionalVariableDeclarations{ HasParams: paramKind != nil, HasAuthorizer: true, + StrictCost: opts.strictCostEnforcement, }, envType) if result.Error != nil { allErrors = append(allErrors, convertCELErrorToValidationError(fldPath.Child("expression"), variable, result.Error)) @@ -1047,6 +1055,7 @@ func validateValidationExpression(compiler plugincel.Compiler, expression string }, plugincel.OptionalVariableDeclarations{ HasParams: hasParams, HasAuthorizer: true, + StrictCost: opts.strictCostEnforcement, }, envType, fldPath) } @@ -1055,11 +1064,18 @@ func validateMatchConditionsExpression(expression string, opts validationOptions if opts.preexistingExpressions.matchConditionExpressions.Has(expression) { envType = environment.StoredExpressions } - return validateCELCondition(statelessCELCompiler, &matchconditions.MatchCondition{ + var compiler plugincel.Compiler + if opts.strictCostEnforcement { + compiler = strictStatelessCELCompiler + } else { + compiler = nonStrictStatelessCELCompiler + } + return validateCELCondition(compiler, &matchconditions.MatchCondition{ Expression: expression, }, plugincel.OptionalVariableDeclarations{ HasParams: opts.allowParamsInMatchConditions, HasAuthorizer: true, + StrictCost: opts.strictCostEnforcement, }, envType, fldPath) } @@ -1073,6 +1089,7 @@ func validateMessageExpression(compiler plugincel.Compiler, expression string, o }, plugincel.OptionalVariableDeclarations{ HasParams: opts.allowParamsInMatchConditions, HasAuthorizer: false, + StrictCost: opts.strictCostEnforcement, }, envType, fldPath) } @@ -1097,7 +1114,7 @@ func validateAuditAnnotation(compiler plugincel.Compiler, meta metav1.ObjectMeta } result := compiler.CompileCELExpression(&validatingadmissionpolicy.AuditAnnotationCondition{ ValueExpression: trimmedValueExpression, - }, plugincel.OptionalVariableDeclarations{HasParams: paramKind != nil, HasAuthorizer: true}, envType) + }, plugincel.OptionalVariableDeclarations{HasParams: paramKind != nil, HasAuthorizer: true, StrictCost: opts.strictCostEnforcement}, envType) if result.Error != nil { switch result.Error.Type { case cel.ErrorTypeRequired: @@ -1191,6 +1208,7 @@ func ValidateValidatingAdmissionPolicyUpdate(newC, oldC *admissionregistration.V return validateValidatingAdmissionPolicy(newC, validationOptions{ ignoreMatchConditions: ignoreValidatingAdmissionPolicyMatchConditions(newC, oldC), preexistingExpressions: findValidatingPolicyPreexistingExpressions(oldC), + strictCostEnforcement: utilfeature.DefaultFeatureGate.Enabled(features.StrictCostEnforcementForVAP), }) } @@ -1250,17 +1268,24 @@ func validateFieldRef(fieldRef string, fldPath *field.Path) field.ErrorList { // statelessCELCompiler does not support variable composition (and thus is stateless). It should be used when // variable composition is not allowed, for example, when validating MatchConditions. -var statelessCELCompiler = plugincel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) +// strictStatelessCELCompiler is a cel Compiler that enforces strict cost enforcement. +// nonStrictStatelessCELCompiler is a cel Compiler that does not enforce strict cost enforcement. +var strictStatelessCELCompiler = plugincel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), true)) +var nonStrictStatelessCELCompiler = plugincel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), false)) -func createCompiler(allowComposition bool) plugincel.Compiler { +func createCompiler(allowComposition, strictCost bool) plugincel.Compiler { if !allowComposition { - return statelessCELCompiler + if strictCost { + return strictStatelessCELCompiler + } else { + return nonStrictStatelessCELCompiler + } } - compiler, err := plugincel.NewCompositedCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) + compiler, err := plugincel.NewCompositedCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), strictCost)) if err != nil { // should never happen, but cannot panic either. utilruntime.HandleError(err) - return plugincel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion())) + return plugincel.NewCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion(), strictCost)) } return compiler } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set.go b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set.go index 8f3a42d23c..3f67ef15da 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set.go @@ -98,7 +98,6 @@ func NewStatefulSetController( recorder), NewRealStatefulSetStatusUpdater(kubeClient, setInformer.Lister()), history.NewHistory(kubeClient, revInformer.Lister()), - recorder, ), pvcListerSynced: pvcInformer.Informer().HasSynced, revListerSynced: revInformer.Informer().HasSynced, @@ -235,6 +234,9 @@ func (ssc *StatefulSetController) updatePod(logger klog.Logger, old, cur interfa return } logger.V(4).Info("Pod objectMeta updated", "pod", klog.KObj(curPod), "oldObjectMeta", oldPod.ObjectMeta, "newObjectMeta", curPod.ObjectMeta) + if oldPod.Status.Phase != curPod.Status.Phase { + logger.V(4).Info("StatefulSet Pod phase changed", "pod", klog.KObj(curPod), "statefulSet", klog.KObj(set), "podPhase", curPod.Status.Phase) + } ssc.enqueueStatefulSet(set) // TODO: MinReadySeconds in the Pod will generate an Available condition to be added in // the Pod status which in turn will trigger a requeue of the owning replica set thus diff --git a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go index ce8c693fc8..01886d6895 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/statefulset/stateful_set_control.go @@ -27,7 +27,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/client-go/tools/record" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller/history" "k8s.io/kubernetes/pkg/features" @@ -61,16 +60,14 @@ type StatefulSetControlInterface interface { func NewDefaultStatefulSetControl( podControl *StatefulPodControl, statusUpdater StatefulSetStatusUpdaterInterface, - controllerHistory history.Interface, - recorder record.EventRecorder) StatefulSetControlInterface { - return &defaultStatefulSetControl{podControl, statusUpdater, controllerHistory, recorder} + controllerHistory history.Interface) StatefulSetControlInterface { + return &defaultStatefulSetControl{podControl, statusUpdater, controllerHistory} } type defaultStatefulSetControl struct { podControl *StatefulPodControl statusUpdater StatefulSetStatusUpdaterInterface controllerHistory history.Interface - recorder record.EventRecorder } // UpdateStatefulSet executes the core logic loop for a stateful set, applying the predictable and @@ -367,45 +364,25 @@ func updateStatus(status *apps.StatefulSetStatus, minReadySeconds int32, current func (ssc *defaultStatefulSetControl) processReplica( ctx context.Context, set *apps.StatefulSet, - currentRevision *apps.ControllerRevision, - updateRevision *apps.ControllerRevision, - currentSet *apps.StatefulSet, updateSet *apps.StatefulSet, monotonic bool, replicas []*v1.Pod, i int) (bool, error) { logger := klog.FromContext(ctx) - // Delete and recreate pods which finished running. - // + // Note that pods with phase Succeeded will also trigger this event. This is // because final pod phase of evicted or otherwise forcibly stopped pods // (e.g. terminated on node reboot) is determined by the exit code of the // container, not by the reason for pod termination. We should restart the pod // regardless of the exit code. if isFailed(replicas[i]) || isSucceeded(replicas[i]) { - if isFailed(replicas[i]) { - ssc.recorder.Eventf(set, v1.EventTypeWarning, "RecreatingFailedPod", - "StatefulSet %s/%s is recreating failed Pod %s", - set.Namespace, - set.Name, - replicas[i].Name) - } else { - ssc.recorder.Eventf(set, v1.EventTypeNormal, "RecreatingTerminatedPod", - "StatefulSet %s/%s is recreating terminated Pod %s", - set.Namespace, - set.Name, - replicas[i].Name) - } - if err := ssc.podControl.DeleteStatefulPod(set, replicas[i]); err != nil { - return true, err + if replicas[i].DeletionTimestamp == nil { + if err := ssc.podControl.DeleteStatefulPod(set, replicas[i]); err != nil { + return true, err + } } - replicaOrd := i + getStartOrdinal(set) - replicas[i] = newVersionedStatefulSetPod( - currentSet, - updateSet, - currentRevision.Name, - updateRevision.Name, - replicaOrd) + // New pod should be generated on the next sync after the current pod is removed from etcd. + return true, nil } // If we find a Pod that has not been created we create the Pod if !isCreated(replicas[i]) { @@ -637,7 +614,7 @@ func (ssc *defaultStatefulSetControl) updateStatefulSet( // First, process each living replica. Exit if we run into an error or something blocking in monotonic mode. processReplicaFn := func(i int) (bool, error) { - return ssc.processReplica(ctx, set, currentRevision, updateRevision, currentSet, updateSet, monotonic, replicas, i) + return ssc.processReplica(ctx, set, updateSet, monotonic, replicas, i) } if shouldExit, err := runForAll(replicas, processReplicaFn, monotonic); shouldExit || err != nil { updateStatus(&status, set.Spec.MinReadySeconds, currentRevision, updateRevision, replicas, condemned) diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index 39b89e9aa6..6b0dda7bce 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -1298,6 +1298,10 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, + genericfeatures.StrictCostEnforcementForVAP: {Default: false, PreRelease: featuregate.Beta}, + + genericfeatures.StrictCostEnforcementForWebhooks: {Default: false, PreRelease: featuregate.Beta}, + genericfeatures.StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta}, diff --git a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go index d6c399a1fb..26019cb3f8 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go +++ b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers.go @@ -3207,6 +3207,9 @@ func (list SortableResourceNames) Less(i, j int) bool { } func isRestartableInitContainer(initContainer *api.Container) bool { + if initContainer == nil { + return false + } if initContainer.RestartPolicy == nil { return false } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go index 5fd8bd86fc..c5b7d89cee 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go @@ -49,7 +49,8 @@ type NodeScore struct { Score int64 } -// NodeToStatusMap declares map from node name to its status. +// NodeToStatusMap contains the statuses of the Nodes where the incoming Pod was not schedulable. +// A PostFilter plugin that uses this map should interpret absent Nodes as UnschedulableAndUnresolvable. type NodeToStatusMap map[string]*Status // NodePluginScores is a struct with node name and scores for that node. @@ -448,6 +449,7 @@ type PostFilterPlugin interface { // If this scheduling cycle failed at PreFilter, all Nodes have the status from the rejector PreFilter plugin in NodeToStatusMap. // Note that the scheduling framework runs PostFilter plugins even when PreFilter returned UnschedulableAndUnresolvable. // In that case, NodeToStatusMap contains all Nodes with UnschedulableAndUnresolvable. + // If there is no entry in the NodeToStatus map, its implicit status is UnschedulableAndUnresolvable. // // Also, ignoring Nodes with UnschedulableAndUnresolvable is the responsibility of each PostFilter plugin, // meaning NodeToStatusMap obviously could have Nodes with UnschedulableAndUnresolvable diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go index 376b6337e9..29864adb52 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go @@ -415,15 +415,18 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1. func nodesWherePreemptionMightHelp(nodes []*framework.NodeInfo, m framework.NodeToStatusMap) ([]*framework.NodeInfo, framework.NodeToStatusMap) { var potentialNodes []*framework.NodeInfo nodeStatuses := make(framework.NodeToStatusMap) + unresolvableStatus := framework.NewStatus(framework.UnschedulableAndUnresolvable, "Preemption is not helpful for scheduling") for _, node := range nodes { - name := node.Node().Name - // We rely on the status by each plugin - 'Unschedulable' or 'UnschedulableAndUnresolvable' - // to determine whether preemption may help or not on the node. - if m[name].Code() == framework.UnschedulableAndUnresolvable { - nodeStatuses[node.Node().Name] = framework.NewStatus(framework.UnschedulableAndUnresolvable, "Preemption is not helpful for scheduling") - continue + nodeName := node.Node().Name + // We only attempt preemption on nodes with status 'Unschedulable'. For + // diagnostic purposes, we propagate UnschedulableAndUnresolvable if either + // implied by absence in map or explicitly set. + status, ok := m[nodeName] + if status.Code() == framework.Unschedulable { + potentialNodes = append(potentialNodes, node) + } else if !ok || status.Code() == framework.UnschedulableAndUnresolvable { + nodeStatuses[nodeName] = unresolvableStatus } - potentialNodes = append(potentialNodes, node) } return potentialNodes, nodeStatuses } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go index 16421d86a8..97ae918dc4 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/types.go @@ -325,9 +325,11 @@ const ExtenderName = "Extender" // Diagnosis records the details to diagnose a scheduling failure. type Diagnosis struct { - // NodeToStatusMap records the status of each node + // NodeToStatusMap records the status of each retriable node (status Unschedulable) // if they're rejected in PreFilter (via PreFilterResult) or Filter plugins. // Nodes that pass PreFilter/Filter plugins are not included in this map. + // While this map may contain UnschedulableAndUnresolvable statuses, the absence of + // a node should be interpreted as UnschedulableAndUnresolvable. NodeToStatusMap NodeToStatusMap // UnschedulablePlugins are plugins that returns Unschedulable or UnschedulableAndUnresolvable. UnschedulablePlugins sets.Set[string] diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go index 115f81afc1..93a8333a4a 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go @@ -1175,6 +1175,11 @@ func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(logger klog.Logger, podIn activated := false for _, pInfo := range podInfoList { + // Since there may be many gated pods and they will not move from the + // unschedulable pool, we skip calling the expensive isPodWorthRequeueing. + if pInfo.Gated { + continue + } schedulingHint := p.isPodWorthRequeuing(logger, pInfo, event, oldObj, newObj) if schedulingHint == queueSkip { // QueueingHintFn determined that this Pod isn't worth putting to activeQ or backoffQ by this event. diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go b/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go index 07c9d5834d..33f68468d2 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/schedule_one.go @@ -441,16 +441,13 @@ func (sched *Scheduler) schedulePod(ctx context.Context, fwk framework.Framework // filter plugins and filter extenders. func (sched *Scheduler) findNodesThatFitPod(ctx context.Context, fwk framework.Framework, state *framework.CycleState, pod *v1.Pod) ([]*framework.NodeInfo, framework.Diagnosis, error) { logger := klog.FromContext(ctx) + diagnosis := framework.Diagnosis{ + NodeToStatusMap: make(framework.NodeToStatusMap), + } allNodes, err := sched.nodeInfoSnapshot.NodeInfos().List() if err != nil { - return nil, framework.Diagnosis{ - NodeToStatusMap: make(framework.NodeToStatusMap), - }, err - } - - diagnosis := framework.Diagnosis{ - NodeToStatusMap: make(framework.NodeToStatusMap, len(allNodes)), + return nil, diagnosis, err } // Run "prefilter" plugins. preRes, s := fwk.RunPreFilterPlugins(ctx, state, pod) @@ -488,14 +485,12 @@ func (sched *Scheduler) findNodesThatFitPod(ctx context.Context, fwk framework.F nodes := allNodes if !preRes.AllNodes() { nodes = make([]*framework.NodeInfo, 0, len(preRes.NodeNames)) - for _, n := range allNodes { - if !preRes.NodeNames.Has(n.Node().Name) { - // We consider Nodes that are filtered out by PreFilterResult as rejected via UnschedulableAndUnresolvable. - // We have to record them in NodeToStatusMap so that they won't be considered as candidates in the preemption. - diagnosis.NodeToStatusMap[n.Node().Name] = framework.NewStatus(framework.UnschedulableAndUnresolvable, "node is filtered out by the prefilter result") - continue + for nodeName := range preRes.NodeNames { + // PreRes may return nodeName(s) which do not exist; we verify + // node exists in the Snapshot. + if nodeInfo, err := sched.nodeInfoSnapshot.Get(nodeName); err == nil { + nodes = append(nodes, nodeInfo) } - nodes = append(nodes, n) } } feasibleNodes, err := sched.findNodesThatPassFilters(ctx, fwk, state, pod, &diagnosis, nodes) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go index 6ce01755fd..dcccb56f10 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go @@ -1064,7 +1064,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2", + Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3", Command: []string{"/bin/sh"}, Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"}, VolumeMounts: []v1.VolumeMount{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 3a85f79d25..7534027caf 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-20240621193825-d0324787c86d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d +# 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 # 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-20240621193825-d0324787c86d +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c From d4de6e0579aa40211a654bf3de193aef356a407d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:21 +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 ac25f6c092..ca2c24a035 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-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d // staging 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 // 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 ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240625195430-733cc9d44d7c // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 6ec3f6805c..547ff0dae1 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-20240621193825-d0324787c86d h1:iG3mzyPQQ4B98xnvBJi+hkOFDOu8JBjt5LOGJ4C2F1U= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d h1:k1q2PqvFtKgmMKFTZmB+Lb0oq3YFRsAWAIHgV+KB7fw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d h1:A30h5YO6B4LyJz61YopJliXmcbGcbdJFJdqqCwlpKlk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d h1:O/hq1RMY7fMA1c5ZDjykotYKjP007qnKvGCVFlet2PU= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d h1:pqfmw3HdQ9pceULJGSQGPWXitZ0jF2UGNobizb5/+zM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d h1:hbE7QtUDO7Q/825t/7G3RTp5j53n1bq9bT9LhDduCUA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d h1:oOL8X2jNCrE7iVEzCCeCKOxHLNa/IJhwHFcqXgc7ga0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +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/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 6f0d947440e4c341244733e35efbb37d30dc4366 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:26 +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 2cdc454ef9..78ca94c2ac 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-20240621193825-d0324787c86d +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240625195430-733cc9d44d7c ## 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-20240621193825-d0324787c86d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d +# 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 From 4515618e6786b973a46d4a585f1ee0128b07e267 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:26 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 55664dd65c..6fb53d4cd0 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:566bf08daa0f3536090027e870383da6ac2d09ae3c9c516fb2e20dc515bff021" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3f0e3ac794ac29f9c5a942b4e27ad998d86a9ef2ac2fc2831fa57a0a7c71a6b" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 59036bb9f7..e3bc638887 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4dd1c584981b03476ab0008218cceec695d9098dabcedcd614a7f2f4e8b240d3" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e581527fa087b9caed611cf4e462847a13312e5ff1da0faf0351d92fb49442" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 23b5c038361e3714e6ed28e58b7eefbe9552d6c1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:28 +0000 Subject: [PATCH 8/9] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 ++--- .../multus/release-multus-x86_64.json | 6 ++--- .../kustomization.aarch64.yaml | 10 ++++----- .../kustomization.x86_64.yaml | 10 ++++----- .../release-olm-aarch64.json | 8 +++---- .../release-olm-x86_64.json | 8 +++---- assets/release/release-aarch64.json | 22 +++++++++---------- assets/release/release-x86_64.json | 22 +++++++++---------- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 34132c1cd8..6d3cc32f38 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4b227afe6c28f7460330327c12cba93a42b4318fa03c75b9dafea79870d21d4a + digest: sha256:baa918fda32e1d9e284e8965fcd0a941586bf3ffc10f2bae1f2d079843f63a78 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0ecb6c5c97832449568c0567442b773b4c5ca6de9967f4936d41f24626e9adfb + digest: sha256:48eb293e302f1f2e97fef84159cbc7ab99a776558b2bfd8a49e59cc76dcdd926 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 8f9f779a29..a51c5027b9 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:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21 + digest: sha256:9592a068846ac1c3d8ad2d564095e8b257361b38c36acb10d8f43ea8e3855593 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349 + digest: sha256:57d643bfc50f86f81df7c737229fe729030997541117a7ed49deb2e038cd0881 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index a6c9ffaa16..5b5ca7d28a 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-06-30-162939" + "base": "4.17.0-0.nightly-arm64-2024-07-01-152414" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b227afe6c28f7460330327c12cba93a42b4318fa03c75b9dafea79870d21d4a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ecb6c5c97832449568c0567442b773b4c5ca6de9967f4936d41f24626e9adfb" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:baa918fda32e1d9e284e8965fcd0a941586bf3ffc10f2bae1f2d079843f63a78", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48eb293e302f1f2e97fef84159cbc7ab99a776558b2bfd8a49e59cc76dcdd926" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 7b4876760c..b087643f4e 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-06-25-162526" + "base": "4.17.0-0.nightly-2024-07-01-124741" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9592a068846ac1c3d8ad2d564095e8b257361b38c36acb10d8f43ea8e3855593", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57d643bfc50f86f81df7c737229fe729030997541117a7ed49deb2e038cd0881" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 46cde00e7f..3b168cded8 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9 + digest: sha256:bfe82a6aec807b9c226ace423a67b42d6f14fea03f7748e7b1170683ee8b0f2c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191 + digest: sha256:0d8ba98f0740db753d712f482f4e5774cbe7bfaa3e07ee678e7709150b4845ad - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd + digest: sha256:b732fdf8845537ea3e170b40b1ee878f71624e87b6cda62a20d3cfd133890c17 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:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d8ba98f0740db753d712f482f4e5774cbe7bfaa3e07ee678e7709150b4845ad - 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:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfe82a6aec807b9c226ace423a67b42d6f14fea03f7748e7b1170683ee8b0f2c 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 fe1cb95351..d8e416e507 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:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2 + digest: sha256:09e9059c6062f292e18bd79bb961225944b7aa804ee105f6e8a4dc5e7b01ac63 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968 + digest: sha256:5d46ab43a70dcf36cdb984f970b73818556dfb53a38f1e35caf739bb037a43d9 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c + digest: sha256:7df65088eae4a9aa7b88162ed401b254e785218a00de01dae7b9cdc51cc91dcc 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:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d46ab43a70dcf36cdb984f970b73818556dfb53a38f1e35caf739bb037a43d9 - 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:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09e9059c6062f292e18bd79bb961225944b7aa804ee105f6e8a4dc5e7b01ac63 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 0653078c5d..4a7835e1ba 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-06-30-162939" + "base": "4.17.0-0.nightly-arm64-2024-07-01-152414" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfe82a6aec807b9c226ace423a67b42d6f14fea03f7748e7b1170683ee8b0f2c", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d8ba98f0740db753d712f482f4e5774cbe7bfaa3e07ee678e7709150b4845ad", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b732fdf8845537ea3e170b40b1ee878f71624e87b6cda62a20d3cfd133890c17" } } 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 fc804c6be1..b369ae5a13 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-06-25-162526" + "base": "4.17.0-0.nightly-2024-07-01-124741" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09e9059c6062f292e18bd79bb961225944b7aa804ee105f6e8a4dc5e7b01ac63", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d46ab43a70dcf36cdb984f970b73818556dfb53a38f1e35caf739bb037a43d9", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7df65088eae4a9aa7b88162ed401b254e785218a00de01dae7b9cdc51cc91dcc" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 06896e8cf3..6cc0198324 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-06-30-162939" + "base": "4.17.0-0.nightly-arm64-2024-07-01-152414" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b75152b0a8f73542ee2abef2715135c82dd20fc66c5a398e6f133103a8c7b06", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3aa1f1d60acc52150522a2583ce994495b1159f8d77359533a4b9604536640f", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42fd1275659c4bb7d8f9fd3e0c7c208b3f8aa73b3e0fca53f67df1db68af5ad9", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b1871293ad385c2dd3da8d7f0653dea566fe8a6245116c2407d5281aadc9136", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6dfc70ed45ea7bbed8952a37fb68bf37d11f0f1555a1a06776a86967d8f49aa", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:079402745bc4cba2c3e81eedc4ce063191ea8a26de3c17f6342108ed80870d5d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b732fdf8845537ea3e170b40b1ee878f71624e87b6cda62a20d3cfd133890c17", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:780427bca18818e866b5b99d72426dcbe4fe54e98c2519d6c89ea8fd7e66d159", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4dd1c584981b03476ab0008218cceec695d9098dabcedcd614a7f2f4e8b240d3", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19742f3bcebe771e52ae6c1d42377738bb65420ddd0c6a10f1b0b2146af30da6", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74ae3c1fbc67d3e6a9c5ce91ee677cb64a910690e814462bdcb62e604085d9ad", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e581527fa087b9caed611cf4e462847a13312e5ff1da0faf0351d92fb49442", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d2f0478fb761929a34a143c6035f9064070fbeeb2a599af9522f908c3eca695", "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:abc6af0564e60a745ceec1ed94a23be5f26f58c8ca36d7e6e198963dfbb76ce2", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:616a405473a4607b6dd7dbb7e5edb859f1260d411330dde0e683463a71b9995d", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd2e426413005f8e5051127f57e634b4a9df7ffca737946e45f57c5acd0b7f41" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3462c085cfe9dbb4705c7a05d93a1341919a4ff2be6c4b2bd6d4c008e6e88c36", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4797f57efbe1df1a791bc1701af292e12c67c9f4c5a589ab3e4c1946b9c95fd2", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9595beb16ea9ac546ae86e10d7ce1a14578f29a5d2b27955e346949a455ce468" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index cbb8190b60..a0801cee6d 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-06-25-162526" + "base": "4.17.0-0.nightly-2024-07-01-124741" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07e8d95d810db091ec0c72f4afb2ee055a9f32eda8979f04a99a11da9cfd7003", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af0de476b81c85944009f585e9d0d17f1745cf204df9983369ac19f9743044b8", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b7715267733f2b8fcb7190a0456d03348b9b3bb280d6dd45bfa73846b39ed3", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e9a37ed71c1d38585e31df7010e7c561fdd34f96b631ec1afae2856b0c9c9b6", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:827ca9fdd8e61d92de287bd26d5f9f919f97c141bb238b1a627cbfdd2d4aa249", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0951354eb99b87171a7e2b9d352db34a5f9519952b12152b9788c190e8652b0", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7df65088eae4a9aa7b88162ed401b254e785218a00de01dae7b9cdc51cc91dcc", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f445e037af9a314307a6af7d7e3f0b634dcb09b9ccdbb341c0b13c9db1ab8e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:566bf08daa0f3536090027e870383da6ac2d09ae3c9c516fb2e20dc515bff021", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40f7953f07715c04755720b8c2112be3bf079d506008ab53b7472e4a651375a8", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcc272767bd5385e8da77f9b8c3810775b46b25b51c2c25f10f96c22b6fe96", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3f0e3ac794ac29f9c5a942b4e27ad998d86a9ef2ac2fc2831fa57a0a7c71a6b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09a3532d93e506c05610ed157b8b9fe6dfb354b321ecc8187fcb183ed5d7e0bb", "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:1f16a7104e080e0b1a4e224df4c645a988534e219387ab37a6b8ab6958aa9ae2", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d552cb424a00d65c3f08725bffb9001b2ace10ba4c10bb5484c13d78d2751ef6", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1277525b951258ad8101613b0a7f8332258fdf3b10103bc76fb1bb5f84e780f0" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:218eed5a61c2cdcba766f1b03412c0618816b708cd7df77e119746c9441f4d22", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57094283ad0a5fe1e8776f73ea182fe0f8807b7b2aa13a718322460662377632", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:347b8222d4a08b46ac878427ca82ebc9d8b513551957e614ddb30db97a61072a" } } From fd4e66cb1c34012cdea1762f15ac7793efd1eef4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 2 Jul 2024 04:12:32 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 4 ++-- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 1cc3b794e5..476f1ae8aa 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.1 -KUBE_GIT_COMMIT=d0324787c86dcd13d4f16745da43b216a6787040 +KUBE_GIT_VERSION=v1.30.2 +KUBE_GIT_COMMIT=733cc9d44d7c449f231313a8f158e265afa4b8c6 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index ac08c54b91..480ad8aa60 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-30-162939 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-01-152414 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index bd7e5ceb59..9d44bfcabf 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-06-25-162526 +OCP_VERSION := 4.17.0-0.nightly-2024-07-01-124741