From e5ee3066f9ddd5811729f061f56cd8af8e81d2a6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:14:19 +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 bfc4ad62e8..3dce20494a 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-29-020346" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-08-29-120159" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-30-231249" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-09-02-002936" From 5de7a521bef91d7138287eeab665ed0df6f53fb1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:14:19 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 42 ++++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 24 +++++++++--------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index adea6c1c86..d736f3798e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,43 @@ -- oc image-arm64 c72b183b6b632269d0210e321931b8fd02fab803 to 2f887e82f90a667eca37234b09ac297ef2394ffe +- api embedded-component 01b3675ba7b364e312ac5da6e632251fbaefdda0 to 85dc560939ef05322ce0b204174e9a02c5376c19 + - 9266736 2024-08-29T16:25:34+02:00 CONSOLE-4055: Add "Getting started resources" console capability + +- cluster-ingress-operator embedded-component 26f0181b04b2639a0d467a3548f96d60471375d9 to 8252ac492c04d161fbcf60ef82af2989c99f4a9d + - 0eb116c 2024-08-29T13:37:25-05:00 Explicitly set DeploymentStrategy for SingleReplica + - 523461a 2024-08-22T19:48:31-04:00 Update the condition's lastTransitionTime only if the condition status changes. + +- cluster-network-operator embedded-component cbb60dc51cd4aefe4bd1d10a214e481073aa9233 to 5c37b84741da2d5ec63dc0b2ae77e2fdf79c022a + - d48adb3 2024-08-29T12:40:32+02:00 OCPBUGS-39189: add required-scc annotation to console-plugin deployment + - 3afbade 2024-08-26T17:03:35-04:00 HyperShift: do not use antiaffinity on single replica control planes + +- kubernetes embedded-component a092ee7d2b3514278dbbcbd47d87fde356c9b0ec to 8188633581d978bd71fa8fd7a4567ed3b831d3be + - a4376ee06 2024-08-29T00:00:30-04:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + +- machine-config-operator embedded-component 005ee68664fa12db7ec159deb984b30421331950 to eeea7495bc40d0f73dd9c2ba030e678ec598d8b1 + - c2978cc7 2024-08-07T10:58:18-04:00 Sync MCP with MachineOSConfig update to capture image built completion + +- openshift-controller-manager embedded-component aabcbc2cf5d944f64e6ebdbc4e0ce7f1b95bd127 to c9324273f9020b9e7e4b8cb10cfcd230528d1783 + - bffeaf3 2024-08-28T13:50:27+05:30 OCPBUGS-30704: replaces deprecated square/go-jose wtih go-jose/go-jose + +- oc image-amd64 c72b183b6b632269d0210e321931b8fd02fab803 to a0501f4d32072b0ee84bafc16751e77b9d88049b + - d4cee447 2024-08-27T17:15:17-04:00 OTA-1153: update-status: re-title "Operator Health" - 5d693a0b 2024-08-27T16:21:00-04:00 OTA-1309: hide the empty "Worker Upgrade" section +- ovn-kubernetes image-amd64 210daea41c93d6ac12391fa9dfa75ae4b68f0048 to 90d145b1785dd6ac4712753c7a23b758877bdecf + - 2e7da21f 2024-08-26T17:25:34+02:00 Dockerfile: Bump OVS to 3.4.0-1 for OKD. + - 7cc63688 2024-08-26T17:00:18+02:00 Dockerfile: Bump OVS to 3.4.0-1 The new OVS version is used by the OVN observability. + +- kubernetes image-amd64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec to 8188633581d978bd71fa8fd7a4567ed3b831d3be + - a4376ee06 2024-08-29T00:00:30-04:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + +- oc image-arm64 2f887e82f90a667eca37234b09ac297ef2394ffe to 93286c9260285c104259f0c50704c4b880c4fec3 + - 56db34e8 2024-08-29T09:45:11-07:00 pkg/cli/admin/upgrade: --to-latest help "next" -> "latest" + - d4cee447 2024-08-27T17:15:17-04:00 OTA-1153: update-status: re-title "Operator Health" + +- ovn-kubernetes image-arm64 210daea41c93d6ac12391fa9dfa75ae4b68f0048 to 90d145b1785dd6ac4712753c7a23b758877bdecf + - 2e7da21f 2024-08-26T17:25:34+02:00 Dockerfile: Bump OVS to 3.4.0-1 for OKD. + - 7cc63688 2024-08-26T17:00:18+02:00 Dockerfile: Bump OVS to 3.4.0-1 The new OVS version is used by the OVN observability. + +- kubernetes image-arm64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec to 191249b6c0b70cf38000467af52bb85346d0dc00 + - eb80296f3 2024-08-29T13:42:55-03:00 UPSTREAM: 126994: Add required FieldManager for validatingadmissionpolicy e2e + - a4376ee06 2024-08-29T00:00:30-04:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ba3e38cabc..90cb5f2062 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,37 +1,37 @@ -https://github.com/openshift/api embedded-component 01b3675ba7b364e312ac5da6e632251fbaefdda0 +https://github.com/openshift/api embedded-component 85dc560939ef05322ce0b204174e9a02c5376c19 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component ffba005bf839897b173cb76d0bb561dcf9c7215c https://github.com/openshift/cluster-dns-operator embedded-component 3a727094ce02cc90e73ca0876eaecaf46f05fbd9 -https://github.com/openshift/cluster-ingress-operator embedded-component 26f0181b04b2639a0d467a3548f96d60471375d9 +https://github.com/openshift/cluster-ingress-operator embedded-component 8252ac492c04d161fbcf60ef82af2989c99f4a9d https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 37df1b1f80d3be6036b9e31975ac42fcb21b6447 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 -https://github.com/openshift/cluster-network-operator embedded-component cbb60dc51cd4aefe4bd1d10a214e481073aa9233 +https://github.com/openshift/cluster-network-operator embedded-component 5c37b84741da2d5ec63dc0b2ae77e2fdf79c022a https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2b962c71d5b3ac179898dc1ece6a98de0b33cd70 https://github.com/openshift/cluster-policy-controller embedded-component c502ece1b8bdccdbc58a327520685d9a1d2f59cf https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 -https://github.com/openshift/kubernetes embedded-component a092ee7d2b3514278dbbcbd47d87fde356c9b0ec +https://github.com/openshift/kubernetes embedded-component 8188633581d978bd71fa8fd7a4567ed3b831d3be https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 005ee68664fa12db7ec159deb984b30421331950 -https://github.com/openshift/openshift-controller-manager embedded-component aabcbc2cf5d944f64e6ebdbc4e0ce7f1b95bd127 +https://github.com/openshift/machine-config-operator embedded-component eeea7495bc40d0f73dd9c2ba030e678ec598d8b1 +https://github.com/openshift/openshift-controller-manager embedded-component c9324273f9020b9e7e4b8cb10cfcd230528d1783 https://github.com/openshift/operator-framework-olm embedded-component 7915649deba09c031b0273c58e47f21eb6975aef 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 c72b183b6b632269d0210e321931b8fd02fab803 +https://github.com/openshift/oc image-amd64 a0501f4d32072b0ee84bafc16751e77b9d88049b https://github.com/openshift/coredns image-amd64 a656fdfff7685829962410a157c4a42a51775978 https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/router image-amd64 47b8420185ec2eb4c7861483921d31c65b912625 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 210daea41c93d6ac12391fa9dfa75ae4b68f0048 -https://github.com/openshift/kubernetes image-amd64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec +https://github.com/openshift/ovn-kubernetes image-amd64 90d145b1785dd6ac4712753c7a23b758877bdecf +https://github.com/openshift/kubernetes image-amd64 8188633581d978bd71fa8fd7a4567ed3b831d3be https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 2f887e82f90a667eca37234b09ac297ef2394ffe +https://github.com/openshift/oc image-arm64 93286c9260285c104259f0c50704c4b880c4fec3 https://github.com/openshift/coredns image-arm64 a656fdfff7685829962410a157c4a42a51775978 https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/router image-arm64 47b8420185ec2eb4c7861483921d31c65b912625 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-arm64 210daea41c93d6ac12391fa9dfa75ae4b68f0048 -https://github.com/openshift/kubernetes image-arm64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec +https://github.com/openshift/ovn-kubernetes image-arm64 90d145b1785dd6ac4712753c7a23b758877bdecf +https://github.com/openshift/kubernetes image-arm64 191249b6c0b70cf38000467af52bb85346d0dc00 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 0090f294de1f1060e71a6e111d206fe5ee070e1d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:14:53 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 64 +++++++++++++++++----------------- go.sum | 108 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/go.mod b/go.mod index 34544e5c69..184338f572 100644 --- a/go.mod +++ b/go.mod @@ -140,7 +140,7 @@ require ( github.com/opencontainers/runc v1.1.12 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect github.com/opencontainers/selinux v1.11.0 // indirect - github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 // indirect + github.com/openshift/apiserver-library-go v0.0.0-20240828192036-4d55b6dd978f // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/profile v1.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -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-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240829172130-8188633581d9 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240829172130-8188633581d9 // 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-20240819213058-a092ee7d2b35 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 // staging kubernetes diff --git a/go.sum b/go.sum index c9067224de..d75719d0ab 100644 --- a/go.sum +++ b/go.sum @@ -453,8 +453,8 @@ github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaL github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9XaBzG76p1UEY8W0aP97EOvv36eOY= github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= -github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 h1:lJ0jen15LqSgZkFQLPPkgDRevNxc8B/Z5/vgZ2LoZ3A= -github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17/go.mod h1:DDVeKBhMfq0TwM4p90dCGz80UeUKPIOCXNBNj3bEXtU= +github.com/openshift/apiserver-library-go v0.0.0-20240828192036-4d55b6dd978f h1:W5z+NEktajGJoKAVYMiCBnmOqqy2rBEusRvlCN7KXz0= +github.com/openshift/apiserver-library-go v0.0.0-20240828192036-4d55b6dd978f/go.mod h1:DDVeKBhMfq0TwM4p90dCGz80UeUKPIOCXNBNj3bEXtU= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U= @@ -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-20240819213058-a092ee7d2b35 h1:pjvJ+WnA3y9fNzakmarRXPl8ZJXsBwHnWythNYwjoBo= -github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:5+ZIvJdjGVvha4ffSLcd9WCTdB2Asw4q7BqML8sSfF4= +github.com/openshift/kubernetes v0.0.0-20240829172130-8188633581d9 h1:NeyB7s+yLwB6gldW0stvRwLezfNmufusvflP1GQyiLQ= +github.com/openshift/kubernetes v0.0.0-20240829172130-8188633581d9/go.mod h1:vW0NimJFmT71wtY71VvU3Z9OY6zs+AntIf5UnDhQgfs= 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-20240819213058-a092ee7d2b35 h1:gAmVIECtmH044BtHEVDxFHPxjWn9E/lvAgW/jV8rrAg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:i+56fNykmer/KzLpF2PtcbNth4xxoL1AqSSZT9XX7VY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:4v6tMwmD7H5J+kWPzhDcfGMWQhsy6cFiPg2j9C/y3Qo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 h1:XeJIYG2szV1bAfvnaxf5Wq2km96kzF8APaM4n6SL1Q0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:EaFMTpB/CHKAE2bnVprUT9MWuJX9v/pziesm/ilBQcI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 h1:wo7FiRi7/P07z5mtqpmyFjoSdqIbVXiRvJfrUJIMyRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 h1:i1A8y8HPoSaSttMRDCFM7KcKj0LoYtHsbrQN6H6BJtI= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 h1:LqRU+t0OdkJCls5QqVa8KiAxyqCMVImVqALuuiGAcGM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 h1:oPrM3AuIPuGXcVzzDUmjQDyHX8SANB/OpIES6ScC1wA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 h1:PygFpFaGQnP4xfIgb1fx+95fcBNUWR1J1JxXkd7Fs2o= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 h1:h8m3VDpcLYNN9CfOaltM/OelQhJasBAzjgpJQvtmgSA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:vqsZ/rUbTSef+QbiWaQ9c1IDYi4hArhT3ItePOIAVSA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 h1:U9IoAJNChorT/fwLbx+Ck7oskNy5jhqPO6x3O5ttcG8= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 h1:A5GJFJyTnXiKHcuoYYP+qwU5ebRanM6GGU3oEfpi7wo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 h1:6U/l7jZXig/PPAm3YK78Hcq6dR3xTDICAWckT+wDof0= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 h1:R5CZxVmeqkdsFEXkm3rtayMMlyVxfkILQq48FcKNyyE= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 h1:bFuN30GGHp5umDhGJDQJzPOi+L4PO69lesOFdkZn8TI= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 h1:jEGlCF0T3Ev9RhYp/OSAqAiN9drcLWAjiAkG8wWJxJE= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 h1:7byexPDB/FvvjbaRs5gfOZdMJ/47al6wEpCNzuUGNVU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:7hfZ7cyZVEhjx05sfgirc1Cyn7Zs13I/Ez+wf8ebC6k= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 h1:c1UpdQT/nv4h6sxkAmEKWz5ePcx8QP4ByG3emR5QLkk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 h1:PV3TuF7BPo6GnbEO/HuxsH4VQCOjtvMNW1M3DocwV+Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 h1:Gi/29SgAOs9fAfzG2lMOoAsA/8R5UXGiFcceH6rJMB8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 h1:e54sc8AETxEWUoVB14uw1H0z1a9EqWBrD8ChkXEZ8Pc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 h1:g6bgOH3FLbDhbm0E9I5saCb79KhbI3rkCW8pU8kO0xQ= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 h1:ssYrmg5oVmZZSNjg9BG0MnmSppDR8vp9gV9CM9Scv0E= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 h1:EBKqoXd93xXzPkfWIBvPX7z6A9Ii1Svi/SJ4k5QZO0Q= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 h1:xtHhh1IQ805gF9q/Vo4q8Z9vowSXD2QNnjXrXTwDbG0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 h1:d18Pchd+8OGO50/95VjUblrj+TE3gQbxjEA5bEWr+Jw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 h1:LINNKAw0sos7d4wpTu2T+GMvsLDUcW5zibMjDvPttuI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9/go.mod h1:4v6tMwmD7H5J+kWPzhDcfGMWQhsy6cFiPg2j9C/y3Qo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 h1:8DKPaWQR7nxficn1OMt/JUJ+HhBkeTl9aIcdGoV7/Gg= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 h1:GEGxT2YePbStYxryFbvPBK4+ttKO5e6tXv3Cec1jhQM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 h1:I8ikcPcBQJkevi1SexPfjLzlBrC9WfgjyxtTaJxDR1I= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 h1:CzVli7Cal7BpOMAu7TR+btzwH4IhEHxgweza0OM2H+0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 h1:lbMNaiTek6AgDBk6hAe/hs7e7iv0rxCQl24znuj3Iog= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 h1:oNX2K7gx3rVaoe9aXJA2txiAkAGPUl8l+J4oawW0EMY= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 h1:T1jml3KHWEIg2XjMmiUcFpdqem7PlMJJieHpvYm6684= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 h1:m6rjLfiZ9Hcw+BSRDD5XWqLCYfE80e2vwqPptHe4oo8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9/go.mod h1:vqsZ/rUbTSef+QbiWaQ9c1IDYi4hArhT3ItePOIAVSA= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 h1:IueUUwHMrul5YCKoz10I0o57qeT6KD1V5x31eBmSRT8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 h1:QlJkECUAtpAQQapSdMaW8UtPcq2nRsFAeCvJ6GnJBgQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 h1:1yTlzNutCcHAJZl6FUW/yXBDix5i25sS82Oi4iGXm9Y= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 h1:qwOr1yT/0JKMKKgEbrbSzSWou9hQUd4w59/Csk+exaM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 h1:NC14/jeLcAYCpzLLgWVH+i9Qq9qbRMy6yN6zL572F+E= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 h1:8MrLBYf4J4GFil+jfVZ6fdyZ7OdA34JLxHzQUDFEgQ8= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 h1:Sl2rbuaQaD+yzHFvvqPQMxCTBuJ65Flit4edIFFb/Ow= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9/go.mod h1:7hfZ7cyZVEhjx05sfgirc1Cyn7Zs13I/Ez+wf8ebC6k= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 h1:MwYuA/fTVcn0XusQHgaN4kaWlLFuMIyXqdlSRhX3oCE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 h1:CCM5CSCfVBpjh8lM/0fPSZDGzHD/O9d5k5h1Fpj+Z64= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 h1:5LQJQOfMxnWLTydbvUCxEwxhIHCb3fnfTSd20PULoEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 h1:BU+s9HKVW1jaWq2IZu6CTG7gbDjFBxEdWuwQHqH9ggs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 h1:mVL0zVon/ucxd4EU7TyKlI0QaasNLY6IU5j1H/fQ9YQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 h1:Fz+icH0y29LP2luzBtycy/T73JlcLG0DvWQ4ckGxKEs= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 h1:RHn/JuN+t7e8L1dJ8GmKkJDC5krMaOUZ7jKZffpXzGk= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 h1:BVr9RJsjWOTgwUR/0S/4OYTOTIp99kpdd+ODbO+cVaM= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9/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 84a2fb191390a5af9a47553934dfc241c15e4dc2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15:21 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../sysctl/mustmatchpatterns.go | 4 + vendor/modules.txt | 116 +++++++++--------- 2 files changed, 62 insertions(+), 58 deletions(-) diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl/mustmatchpatterns.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl/mustmatchpatterns.go index 2c9b9e5b0f..4a67b043c5 100644 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl/mustmatchpatterns.go +++ b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl/mustmatchpatterns.go @@ -36,6 +36,10 @@ func SafeSysctlAllowlist() []string { "net.ipv4.tcp_syncookies", "net.ipv4.ping_group_range", "net.ipv4.ip_unprivileged_port_start", + "net.ipv4.tcp_keepalive_time", + "net.ipv4.tcp_fin_timeout", + "net.ipv4.tcp_keepalive_intvl", + "net.ipv4.tcp_keepalive_probes", } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 741b978055..f65fd11afd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -552,7 +552,7 @@ github.com/openshift/api/template github.com/openshift/api/template/v1 github.com/openshift/api/user github.com/openshift/api/user/v1 -# github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 +# github.com/openshift/apiserver-library-go v0.0.0-20240828192036-4d55b6dd978f ## explicit; go 1.22.0 github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy/apis/imagepolicy/v1 @@ -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-20240819213058-a092ee7d2b35 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240829172130-8188633581d9 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240829172130-8188633581d9 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240829172130-8188633581d9 # 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-20240819213058-a092ee7d2b35 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 From 275fb965483312f100a687d5406c38ce7c64e21b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15: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 c473326b22..ae9ebef6ba 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-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240829172130-8188633581d9 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240829172130-8188633581d9 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index ef49e43f68..71ad2e6702 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-20240819213058-a092ee7d2b35 h1:gAmVIECtmH044BtHEVDxFHPxjWn9E/lvAgW/jV8rrAg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 h1:XeJIYG2szV1bAfvnaxf5Wq2km96kzF8APaM4n6SL1Q0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:EaFMTpB/CHKAE2bnVprUT9MWuJX9v/pziesm/ilBQcI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 h1:wo7FiRi7/P07z5mtqpmyFjoSdqIbVXiRvJfrUJIMyRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 h1:i1A8y8HPoSaSttMRDCFM7KcKj0LoYtHsbrQN6H6BJtI= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 h1:PygFpFaGQnP4xfIgb1fx+95fcBNUWR1J1JxXkd7Fs2o= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 h1:Gi/29SgAOs9fAfzG2lMOoAsA/8R5UXGiFcceH6rJMB8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 h1:d18Pchd+8OGO50/95VjUblrj+TE3gQbxjEA5bEWr+Jw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 h1:8DKPaWQR7nxficn1OMt/JUJ+HhBkeTl9aIcdGoV7/Gg= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 h1:GEGxT2YePbStYxryFbvPBK4+ttKO5e6tXv3Cec1jhQM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 h1:I8ikcPcBQJkevi1SexPfjLzlBrC9WfgjyxtTaJxDR1I= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 h1:CzVli7Cal7BpOMAu7TR+btzwH4IhEHxgweza0OM2H+0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 h1:T1jml3KHWEIg2XjMmiUcFpdqem7PlMJJieHpvYm6684= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 h1:5LQJQOfMxnWLTydbvUCxEwxhIHCb3fnfTSd20PULoEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9/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 50d83679256927228f7946067428ffb4219b3121 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15:27 +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 ca4aae8b81..0c59e3934f 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-20240819213058-a092ee7d2b35 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 ## 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-20240819213058-a092ee7d2b35 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240829172130-8188633581d9 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240829172130-8188633581d9 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240829172130-8188633581d9 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240829172130-8188633581d9 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240829172130-8188633581d9 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240829172130-8188633581d9 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240829172130-8188633581d9 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240829172130-8188633581d9 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240829172130-8188633581d9 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240829172130-8188633581d9 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240829172130-8188633581d9 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240829172130-8188633581d9 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240829172130-8188633581d9 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240829172130-8188633581d9 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240829172130-8188633581d9 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240829172130-8188633581d9 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240829172130-8188633581d9 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240829172130-8188633581d9 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240829172130-8188633581d9 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240829172130-8188633581d9 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240829172130-8188633581d9 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240829172130-8188633581d9 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240829172130-8188633581d9 From 7dbc3fd20b0d02e6f2db8ee8acaee155541a1195 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15:27 +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 781a85c45a..7cbe316d64 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:dd8e46d497df5e239c5700ac322fc6e802c17bc92d0c2487f159f91b81c641ab" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2b258e08bdc8c1242c2c88c9e7ab48883bdbc0b21d3f963f0b0d275c7760fd7" 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 03bf1de75e..8fb3d51eac 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:dde00d1e697b62f24f12dd771c36eeff0342e3e27f088e3685b3e3ac8dafc0d5" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:647120537e0c9e53c068436fbe16363333010c9997b41a3eac3b4d4092cbe2a4" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 8208eb26092203c72e482862935eea057fd298ab Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15:29 +0000 Subject: [PATCH 8/9] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 8 ++++---- assets/release/release-x86_64.json | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 384749ed54..d90a423bf4 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-08-29-120159" + "base": "4.18.0-0.nightly-arm64-2024-09-02-002936" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bb9fdcf25dd5512c889827d0d9b96750a6c2932971fe1a32c484fc295348b5c", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 086bca7242..e07f087150 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-08-29-020346" + "base": "4.18.0-0.nightly-2024-08-30-231249" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55fb4277c7e47714415e9773001aee43b3af0f1314970bbd33d1a691662eb147", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 6be5600acf..899c990822 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-08-29-120159" + "base": "4.18.0-0.nightly-arm64-2024-09-02-002936" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44e1ceccd8f290ffcfd530c2da7cc2290f9bb85ab82db24119ea6c435082a867", 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 9f1435394a..9b6ec01655 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-08-29-020346" + "base": "4.18.0-0.nightly-2024-08-30-231249" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0c638da04bdf6a82521cf501523325af1e3c92c7ccc00287614f26477e521b1", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 01a8612da7..60b9c607a8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-08-29-120159" + "base": "4.18.0-0.nightly-arm64-2024-09-02-002936" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eb90fa4d55aa05d21237dbae98e2043cfa597dc12c2c90a8e1ed8a569a5ee04", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce5530e0c40742c8234b3a9145e2f19e2cae7dcf121636262b349ed9347cfc71", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e436b14c96dba6250760cac79f4cdb948bd9a1e0fc144b3b6b5ef88ce920c7b", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba5edd4d6d94dc96d1bf366762e0ee5c8f19c8757673baa17c6f3d522836a407", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c08965f728f1b7e2e11a218f27e78fe37b1317120d324ad6f7f84917282c51c2", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:815e559cefa805b92c018e45e1029ac9b0b2cd0ce658455ac206cb9d62fe2200", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dde00d1e697b62f24f12dd771c36eeff0342e3e27f088e3685b3e3ac8dafc0d5", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c908dd7617a012e84d569137ad8f89d71cbf2a46b144eb882229799b2221c78", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:647120537e0c9e53c068436fbe16363333010c9997b41a3eac3b4d4092cbe2a4", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cba567281555642dbf5100ad0022f41fa5222e9e9c456a81726dafb1a4c38312", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:812c012d8797a7dd9f2b16b749b8e7ec3452c9250f293397d7a6cdcefa786c99", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 292b4a4f53..4885a4331d 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.18.0-0.nightly-2024-08-29-020346" + "base": "4.18.0-0.nightly-2024-08-30-231249" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88283d09f83af1bb4ce283b88a2841dabfaa49af4feed366af510b7a5dca02ad", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43db8a37f0a6825c69a0a31941ddadf3f54e240f4a40fe22cedc3fd7ed00c99e", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c6a75c9c9ec516bc20db7f2686cde5072b4608b854ae57d072357e9ec38bfdf", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5adcb7b4fee01cc4a6436eb27a6c2b7c88e63d1421b559598083add33a34e52", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:756b2dfcafd33286f162a6e80a78e9006ec595d7d752c31d2f007be06564a84b", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f50c13dd28d1fb27ca443ddf611c040fea65bbe3e88f4d1bf6cd3da1117485e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd8e46d497df5e239c5700ac322fc6e802c17bc92d0c2487f159f91b81c641ab", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a882bd9948ff2e5a5a76f1693e42df041d948a3383f23cbd77fd45790db9ba4", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2b258e08bdc8c1242c2c88c9e7ab48883bdbc0b21d3f963f0b0d275c7760fd7", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae6043c154ee3197f4d5a696efb9b6111dd4815275db1ec90e5724d2eabfffd1", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5636cf3df8acf8e45496971300c8e3a5e6364c621ca819ccce2b471c3d17431", From 9ec4a824943e9e5805d2370d8490932392f83091 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 2 Sep 2024 04:15:29 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 2b8910c7f3..bf9d4bb9e8 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.3 -KUBE_GIT_COMMIT=a092ee7d2b3514278dbbcbd47d87fde356c9b0ec +KUBE_GIT_COMMIT=8188633581d978bd71fa8fd7a4567ed3b831d3be KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 2883b11c27..44532dcb2b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2024-08-29-120159 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-02-002936 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index cd059e69d0..5528e1990b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-08-29-020346 +OCP_VERSION := 4.18.0-0.nightly-2024-08-30-231249