From 07d3d1a4cfe2dd76d36af07017cec26acc1979a9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:17:11 +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 a0fa5f6df5..107750d839 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-15-034821" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-15-221845" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-16-202442" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-16-204900" From c1b1fbb6ef0897060fb92d9f5b9618bcd8490050 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:17:11 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 28 +++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 16 ++++++++-------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 40ad5e965a..7c4222b573 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,4 +1,19 @@ -- ovn-kubernetes image-arm64 1d4ea50a317fa4a1fd01122a6c2cab5e76b01e97 to 9168abf8a94cbd83a7fd53fc675fb42afea870ea +- api embedded-component 40c9497c12f4ce70515787dfc8db63f0d22e97b7 to e9f09d21bcb566954b1c28ba242887ae93979436 + - 5a8b954 2024-07-15T11:13:06-04:00 Feature gate verification should use new variant registry + - 2d61624 2024-07-12T15:47:29-04:00 NE-1530: Fix empty subnet list CEL validation + +- kubernetes embedded-component 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c to b9176556cda6da83643241a8eadbefd79fa50151 + - 31e577152 2024-07-16T13:19:01+02:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + - 4ccf91a46 2024-07-11T07:58:53-04:00 UPSTREAM: : bump cadvisor for 3516 upstream patches + +- openshift-controller-manager embedded-component 37f5f00b5afb1e5d28f2e62ff91d4977985ec603 to 3d6b2b477b61eeca458e23a791ba95bc476caad1 + - 00e32c7 2024-07-12T08:55:57-04:00 fix nil pointer dereference + - 7d8c68a 2024-07-12T08:55:26-04:00 handle orphaned managed image pull secrets + +- oc image-amd64 981134497d2996edf5097d3b58833bfe04cc86a7 to 1127650882a9e42d059dca74c21915155afaeb2e + - 11276508 2024-07-16T07:45:13+00:00 WRKLDS-1314: create image command (#1819) + +- ovn-kubernetes image-amd64 1d4ea50a317fa4a1fd01122a6c2cab5e76b01e97 to 9168abf8a94cbd83a7fd53fc675fb42afea870ea - 09af1c13 2024-07-11T20:20:51+02:00 udn: Skip non ovn nads - 681f7cab 2024-07-11T11:18:32+02:00 Always enable global IPv6 forwarding - 425a328c 2024-07-10T12:58:03-07:00 helm: Add conditional image pull secrets to Helm charts @@ -35,3 +50,14 @@ - b550c8e0 2024-07-01T12:48:44+02:00 ef e2e: make sure external containers are running and ready to serve before starting the test. - a5901db1 2024-06-26T20:17:23+00:00 Docs: add new branch as part of release process +- kubernetes image-amd64 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c to b9176556cda6da83643241a8eadbefd79fa50151 + - 31e577152 2024-07-16T13:19:01+02:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + - 4ccf91a46 2024-07-11T07:58:53-04:00 UPSTREAM: : bump cadvisor for 3516 upstream patches + +- oc image-arm64 981134497d2996edf5097d3b58833bfe04cc86a7 to 1127650882a9e42d059dca74c21915155afaeb2e + - 11276508 2024-07-16T07:45:13+00:00 WRKLDS-1314: create image command (#1819) + +- kubernetes image-arm64 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c to b9176556cda6da83643241a8eadbefd79fa50151 + - 31e577152 2024-07-16T13:19:01+02:00 UPSTREAM: : bump(github.com/openshift/apiserver-library-go) + - 4ccf91a46 2024-07-11T07:58:53-04:00 UPSTREAM: : bump cadvisor for 3516 upstream patches + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 90ac921c52..0560aa39fc 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,4 +1,4 @@ -https://github.com/openshift/api embedded-component 40c9497c12f4ce70515787dfc8db63f0d22e97b7 +https://github.com/openshift/api embedded-component e9f09d21bcb566954b1c28ba242887ae93979436 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 3bd59c8d4e96176aa8db2f5ce84e731354838243 https://github.com/openshift/cluster-dns-operator embedded-component 3c5bb64b9b5f9b4c3132c4c38d74155037009370 https://github.com/openshift/cluster-ingress-operator embedded-component defe53fbbdbaff8ecbbe562acef92e4b4a596f61 @@ -10,24 +10,24 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component c502ece1b8bdccdbc58a327520685d9a1d2f59cf https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 -https://github.com/openshift/kubernetes embedded-component 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c +https://github.com/openshift/kubernetes embedded-component b9176556cda6da83643241a8eadbefd79fa50151 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 https://github.com/openshift/machine-config-operator embedded-component 6968535ff182ae863a5309558239df879359b8d6 -https://github.com/openshift/openshift-controller-manager embedded-component 37f5f00b5afb1e5d28f2e62ff91d4977985ec603 +https://github.com/openshift/openshift-controller-manager embedded-component 3d6b2b477b61eeca458e23a791ba95bc476caad1 https://github.com/openshift/operator-framework-olm embedded-component 79f360bfe22a46a390f578a239f909f5faaf954c 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 981134497d2996edf5097d3b58833bfe04cc86a7 +https://github.com/openshift/oc image-amd64 1127650882a9e42d059dca74c21915155afaeb2e https://github.com/openshift/coredns image-amd64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/router image-amd64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 1d4ea50a317fa4a1fd01122a6c2cab5e76b01e97 -https://github.com/openshift/kubernetes image-amd64 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c +https://github.com/openshift/ovn-kubernetes image-amd64 9168abf8a94cbd83a7fd53fc675fb42afea870ea +https://github.com/openshift/kubernetes image-amd64 b9176556cda6da83643241a8eadbefd79fa50151 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 981134497d2996edf5097d3b58833bfe04cc86a7 +https://github.com/openshift/oc image-arm64 1127650882a9e42d059dca74c21915155afaeb2e https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 @@ -35,5 +35,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f05 https://github.com/openshift/router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 https://github.com/openshift/ovn-kubernetes image-arm64 9168abf8a94cbd83a7fd53fc675fb42afea870ea -https://github.com/openshift/kubernetes image-arm64 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c +https://github.com/openshift/kubernetes image-arm64 b9176556cda6da83643241a8eadbefd79fa50151 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 038464b6e6dd477a46110d8ab3785262adc43989 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:17:47 +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 2472773787..4bdb69204f 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-20240528110119-d099d1006d9d // indirect + github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 // 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-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240711114950-61de516d1eb1 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240711114950-61de516d1eb1 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240716152432-b9176556cda6 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240716152432-b9176556cda6 // 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-20240711114950-61de516d1eb1 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 // staging kubernetes diff --git a/go.sum b/go.sum index de9314b6f8..94e3ae991b 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-20240528110119-d099d1006d9d h1:4vbt+vT7Mw6MIYXL4dF+MS+kv2rpUJPw1qpRSlEiFAs= -github.com/openshift/apiserver-library-go v0.0.0-20240528110119-d099d1006d9d/go.mod h1:DDVeKBhMfq0TwM4p90dCGz80UeUKPIOCXNBNj3bEXtU= +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/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-20240711114950-61de516d1eb1 h1:NAus3fsPfZ5ztl6B/ZlI7ev8oEvrqeoylwwUrAaQSwc= -github.com/openshift/kubernetes v0.0.0-20240711114950-61de516d1eb1/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= +github.com/openshift/kubernetes v0.0.0-20240716152432-b9176556cda6 h1:eqRNmVnHG3OoFeR/br09PZWn86NW2PpaC7v9mL7epYs= +github.com/openshift/kubernetes v0.0.0-20240716152432-b9176556cda6/go.mod h1:5+ZIvJdjGVvha4ffSLcd9WCTdB2Asw4q7BqML8sSfF4= 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-20240711114950-61de516d1eb1 h1:Xt8xL0uECTYLmzcMvI161wEb8AucbGo7Fuv01cjmIqo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240711114950-61de516d1eb1/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1 h1:H09nnJygoPEyltequc4yj9zIwFGU6oHua+YwSZm63EI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 h1:mYDc4UDOdZSXnTfS3yLR1OXvKA+NomZhnDnqRwTITvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 h1:3qgoJQyuV4r9wYl1R96L3ZNLFc1TJiIZcHwtza5oMbg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 h1:Z7CGGrArPt6wjg9oVlGJWnmk9+s4oXwHpF/rg9D5Ork= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 h1:bffT66eSJVvE61fY0q4XCWbr/asLMoZaKy8phLBvlFU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1 h1:qmc7o3vMA6u7wUpmntv2P3KwRDAyU26zQUaAd9se+4E= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1 h1:b+8T9TdzhrsOnW5Q+H8K95+a0nn3+qdSoqKp0yyzhyU= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 h1:JqgMshOxkRVvcVH5oDO9ajysLIFv6LuJ+ItBlJeDiFs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1 h1:tM9swaZ4gAJqzLyySKQe5nCq2TUrRdwlzXaWkqZzB+E= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1 h1:txW1n72sOj7HJ9J7j+7VljmNBeJuy4T/b3arJ+rGrkI= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1 h1:sYc9DzymB4H17nU+Z3diBZwbwHiIiTnerydny094I6k= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1 h1:l+hsGN8RX09KDsucea6hl9aufS9VjmrYEiLQip3mBnw= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1 h1:esRPAHxAzOb4pFfet+nDfujjQ8Cc2+W0OlNql+JLiAI= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240711114950-61de516d1eb1 h1:x49c1vF4EqTdc8KjxWXm1CGJTa6JXpfc+M17yYSAAAA= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240711114950-61de516d1eb1/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1 h1:KjKMYTb3t8yR7dNn5+lox6DI7lha9G5asT3BSkcG20Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1 h1:CxXl+gIWZlCNKbZ53f+l1Rrm6yoey5+7A/xtyMIWfQc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1 h1:SjuSmJ9/f9fAv9Mhp+3WAci35Tih8nZ7HQOYmIAmQr8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1 h1:yibTpKmyB38Sy9RzP/TUCGZB8jLYXmO3dOXnu7TP9qA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 h1:kYni2JPsd0s+OTJYchZxQupTdGhnAoEi8NapB6wHqnI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1 h1:seGVSXj5LULX82/h4ueHRs/MsEECX6lbpnAuS07WJY8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1 h1:Amq6WL4tPha1+0VNO4DlghRdxLc/6EVqkXCF+NJIkoc= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1 h1:/8DbH8KTWsT+iD1pybNHgj88XxDoT4ZIf+Zbg3tprVo= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1 h1:/AFHIgM/Be7XTh24wLZNl45vSYxa7WBlQzbLeogvlqA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1 h1:bVPBxEVnPOr6xiaI1PR/vBSipqKjeqym0S24hR1qj30= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 h1:FY+Asf0rC+AVYBx3ERDwmt91C7LnEdgem/aFPK5hgAY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 h1:afL0GqQBG60JdsxPifgazSziHPhW7+ZGjFshdPBE/Os= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6/go.mod h1:4v6tMwmD7H5J+kWPzhDcfGMWQhsy6cFiPg2j9C/y3Qo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 h1:8gyHGvFsyJsbIpUbhgSoQPJCElDna9hqOW3zECLWgCM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 h1:qDQSO1bcMO6UtFFAcbVHc9RFesjCUaAlGQuySD2cwyw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 h1:Y89x4IPrrPTn1JdMLD5z52HeTGPEmmv4zQ47T1kENUg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 h1:1qu2fZbMKeO53d2RTgfCe9ZW665YhE+HOGpoB+kuw3U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 h1:uCiUwFTf+CKD1u//ASyrodf99cI9Lb49TkdU+imrcTU= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 h1:vAObFSMbONWHWn6w1pOU6XGDA7JWYj0Kj2PzFIPIiPk= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 h1:6OG8HfpkWH3ED01iwC8RemlLk514Dunj5/1L8mli7Fo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 h1:QFDUQGile0BiA0SpPSi5qwiSSPVB9LCXOsCAoCB0kMU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6/go.mod h1:vqsZ/rUbTSef+QbiWaQ9c1IDYi4hArhT3ItePOIAVSA= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 h1:KYplcb3xWCd0SGaWbncEPmRU3SFQMLpM4D61qkpSxuw= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 h1:qeOd/l86XDYSVfaUdwZZrQ2bEYMjqMe1zR6Msu4pvv8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 h1:3RiomVxnw8aAIWyFvLgr72DUNKLOnjfsRFB7LHsJP10= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 h1:Cty8Ii4FVeYAl2PgHl6Wq2Qv9ushFFGQcE0cGOUEdL0= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 h1:3vWzGch/Hv04kicaJaS/qtl9nqoj3DFCIq8VtQd55jI= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 h1:jCT8dYhBJWFTTVskAd4MA2S3fvNJ9hahpaYdfvNrnoI= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 h1:pWfxBGqvCnw2BqQ6tppU0EWPQG/9gBeBralaeKrXiUY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6/go.mod h1:7hfZ7cyZVEhjx05sfgirc1Cyn7Zs13I/Ez+wf8ebC6k= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 h1:x6ZAgssf7a7CXeYWtKKDtkOJkQKHEBqnWNPJmmGNa9w= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 h1:NG63BEAwUekrUMAS7rroHpMcjIMreNR9Metr6lGNql4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 h1:cCHcYSdB7J/4M8aF7yYZdRuHTdeq8Zwxiy5JyXZd0ls= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 h1:bF98WPZ2XbA9n/ynr7x9PgodSJecwQX7BMEvwrZVai0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 h1:o42eObfYmn7CQrYW854M0Vmqld0uAqILBrckxg1ljLY= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 h1:PjCgaemX1Qs/RbXZ6nzNqPPMIMvC+irmmocdYF0zsBM= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 h1:gL6ck6iBr1vr/H5YNFBfvpQl60pWrHyM3KPiPfxJfwU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 h1:0KC+R+NO0HMOMKo0Z8dMYOQ8rApSRImjVtPBau6RbMo= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6/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 fbf61ad26307d8511513ca846ec0a8193f886594 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:06 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../sccmatching/patched_sc_accessors.go | 471 ------------------ .../sccmatching/provider.go | 8 +- vendor/modules.txt | 116 ++--- 3 files changed, 62 insertions(+), 533 deletions(-) delete mode 100644 vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/patched_sc_accessors.go diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/patched_sc_accessors.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/patched_sc_accessors.go deleted file mode 100644 index 7b24270c93..0000000000 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/patched_sc_accessors.go +++ /dev/null @@ -1,471 +0,0 @@ -/* - * This file is a copy of k8s.io/kubernetes/pkg/securitycontext/accessors.go that - * contains the patch from https://github.com/kubernetes/kubernetes/pull/115968 - * that only appears in kube 1.27. - * FIXME: Remove this file when OpenShift users kube 1.27 as its base. - */ - -package sccmatching - -import ( - "reflect" - - api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/securitycontext" -) - -type SecccompProfileAccessor interface { - SeccompProfile() *api.SeccompProfile -} - -type SeccompProfileMutator interface { - SetSeccompProfile(*api.SeccompProfile) -} - -type PatchedPodSecurityContextAccessor interface { - securitycontext.PodSecurityContextAccessor - SecccompProfileAccessor -} - -type PatchedPodSecurityContextMutator interface { - securitycontext.PodSecurityContextMutator - SecccompProfileAccessor - SeccompProfileMutator -} - -// NewPodSecurityContextAccessor returns an accessor for the given pod security context. -// May be initialized with a nil PodSecurityContext. -func NewPodSecurityContextAccessor(podSC *api.PodSecurityContext) PatchedPodSecurityContextAccessor { - return &podSecurityContextWrapper{podSC: podSC} -} - -// NewPodSecurityContextMutator returns a mutator for the given pod security context. -// May be initialized with a nil PodSecurityContext. -func NewPodSecurityContextMutator(podSC *api.PodSecurityContext) PatchedPodSecurityContextMutator { - return &podSecurityContextWrapper{podSC: podSC} -} - -type podSecurityContextWrapper struct { - podSC *api.PodSecurityContext -} - -func (w *podSecurityContextWrapper) PodSecurityContext() *api.PodSecurityContext { - return w.podSC -} - -func (w *podSecurityContextWrapper) ensurePodSC() { - if w.podSC == nil { - w.podSC = &api.PodSecurityContext{} - } -} - -func (w *podSecurityContextWrapper) HostNetwork() bool { - if w.podSC == nil { - return false - } - return w.podSC.HostNetwork -} -func (w *podSecurityContextWrapper) SetHostNetwork(v bool) { - if w.podSC == nil && v == false { - return - } - w.ensurePodSC() - w.podSC.HostNetwork = v -} -func (w *podSecurityContextWrapper) HostPID() bool { - if w.podSC == nil { - return false - } - return w.podSC.HostPID -} -func (w *podSecurityContextWrapper) SetHostPID(v bool) { - if w.podSC == nil && v == false { - return - } - w.ensurePodSC() - w.podSC.HostPID = v -} -func (w *podSecurityContextWrapper) HostIPC() bool { - if w.podSC == nil { - return false - } - return w.podSC.HostIPC -} -func (w *podSecurityContextWrapper) SetHostIPC(v bool) { - if w.podSC == nil && v == false { - return - } - w.ensurePodSC() - w.podSC.HostIPC = v -} -func (w *podSecurityContextWrapper) SELinuxOptions() *api.SELinuxOptions { - if w.podSC == nil { - return nil - } - return w.podSC.SELinuxOptions -} -func (w *podSecurityContextWrapper) SetSELinuxOptions(v *api.SELinuxOptions) { - if w.podSC == nil && v == nil { - return - } - w.ensurePodSC() - w.podSC.SELinuxOptions = v -} -func (w *podSecurityContextWrapper) RunAsUser() *int64 { - if w.podSC == nil { - return nil - } - return w.podSC.RunAsUser -} -func (w *podSecurityContextWrapper) SetRunAsUser(v *int64) { - if w.podSC == nil && v == nil { - return - } - w.ensurePodSC() - w.podSC.RunAsUser = v -} -func (w *podSecurityContextWrapper) RunAsGroup() *int64 { - if w.podSC == nil { - return nil - } - return w.podSC.RunAsGroup -} -func (w *podSecurityContextWrapper) SetRunAsGroup(v *int64) { - if w.podSC == nil && v == nil { - return - } - w.ensurePodSC() - w.podSC.RunAsGroup = v -} - -func (w *podSecurityContextWrapper) RunAsNonRoot() *bool { - if w.podSC == nil { - return nil - } - return w.podSC.RunAsNonRoot -} -func (w *podSecurityContextWrapper) SetRunAsNonRoot(v *bool) { - if w.podSC == nil && v == nil { - return - } - w.ensurePodSC() - w.podSC.RunAsNonRoot = v -} -func (w *podSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { - if w.podSC == nil { - return nil - } - return w.podSC.SeccompProfile -} -func (w *podSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { - if w.podSC == nil && p == nil { - return - } - w.ensurePodSC() - w.podSC.SeccompProfile = p -} -func (w *podSecurityContextWrapper) SupplementalGroups() []int64 { - if w.podSC == nil { - return nil - } - return w.podSC.SupplementalGroups -} -func (w *podSecurityContextWrapper) SetSupplementalGroups(v []int64) { - if w.podSC == nil && len(v) == 0 { - return - } - w.ensurePodSC() - if len(v) == 0 && len(w.podSC.SupplementalGroups) == 0 { - return - } - w.podSC.SupplementalGroups = v -} -func (w *podSecurityContextWrapper) FSGroup() *int64 { - if w.podSC == nil { - return nil - } - return w.podSC.FSGroup -} -func (w *podSecurityContextWrapper) SetFSGroup(v *int64) { - if w.podSC == nil && v == nil { - return - } - w.ensurePodSC() - w.podSC.FSGroup = v -} - -type PatchedContainerSecurityContextAccessor interface { - securitycontext.ContainerSecurityContextAccessor - SecccompProfileAccessor -} - -type PatchedContainerSecurityContextMutator interface { - securitycontext.ContainerSecurityContextMutator - SecccompProfileAccessor - SeccompProfileMutator -} - -// NewContainerSecurityContextAccessor returns an accessor for the provided container security context -// May be initialized with a nil SecurityContext -func NewContainerSecurityContextAccessor(containerSC *api.SecurityContext) PatchedContainerSecurityContextAccessor { - return &containerSecurityContextWrapper{containerSC: containerSC} -} - -// NewContainerSecurityContextMutator returns a mutator for the provided container security context -// May be initialized with a nil SecurityContext -func NewContainerSecurityContextMutator(containerSC *api.SecurityContext) PatchedContainerSecurityContextMutator { - return &containerSecurityContextWrapper{containerSC: containerSC} -} - -type containerSecurityContextWrapper struct { - containerSC *api.SecurityContext -} - -func (w *containerSecurityContextWrapper) ContainerSecurityContext() *api.SecurityContext { - return w.containerSC -} - -func (w *containerSecurityContextWrapper) ensureContainerSC() { - if w.containerSC == nil { - w.containerSC = &api.SecurityContext{} - } -} - -func (w *containerSecurityContextWrapper) Capabilities() *api.Capabilities { - if w.containerSC == nil { - return nil - } - return w.containerSC.Capabilities -} -func (w *containerSecurityContextWrapper) SetCapabilities(v *api.Capabilities) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.Capabilities = v -} -func (w *containerSecurityContextWrapper) Privileged() *bool { - if w.containerSC == nil { - return nil - } - return w.containerSC.Privileged -} -func (w *containerSecurityContextWrapper) SetPrivileged(v *bool) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.Privileged = v -} -func (w *containerSecurityContextWrapper) ProcMount() api.ProcMountType { - if w.containerSC == nil { - return api.DefaultProcMount - } - if w.containerSC.ProcMount == nil { - return api.DefaultProcMount - } - return *w.containerSC.ProcMount -} -func (w *containerSecurityContextWrapper) SELinuxOptions() *api.SELinuxOptions { - if w.containerSC == nil { - return nil - } - return w.containerSC.SELinuxOptions -} -func (w *containerSecurityContextWrapper) SetSELinuxOptions(v *api.SELinuxOptions) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.SELinuxOptions = v -} -func (w *containerSecurityContextWrapper) RunAsUser() *int64 { - if w.containerSC == nil { - return nil - } - return w.containerSC.RunAsUser -} -func (w *containerSecurityContextWrapper) SetRunAsUser(v *int64) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.RunAsUser = v -} -func (w *containerSecurityContextWrapper) RunAsGroup() *int64 { - if w.containerSC == nil { - return nil - } - return w.containerSC.RunAsGroup -} -func (w *containerSecurityContextWrapper) SetRunAsGroup(v *int64) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.RunAsGroup = v -} - -func (w *containerSecurityContextWrapper) RunAsNonRoot() *bool { - if w.containerSC == nil { - return nil - } - return w.containerSC.RunAsNonRoot -} -func (w *containerSecurityContextWrapper) SetRunAsNonRoot(v *bool) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.RunAsNonRoot = v -} -func (w *containerSecurityContextWrapper) ReadOnlyRootFilesystem() *bool { - if w.containerSC == nil { - return nil - } - return w.containerSC.ReadOnlyRootFilesystem -} -func (w *containerSecurityContextWrapper) SetReadOnlyRootFilesystem(v *bool) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.ReadOnlyRootFilesystem = v -} -func (w *containerSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { - if w.containerSC == nil { - return nil - } - return w.containerSC.SeccompProfile -} -func (w *containerSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { - if w.containerSC == nil && p == nil { - return - } - w.ensureContainerSC() - w.containerSC.SeccompProfile = p -} - -func (w *containerSecurityContextWrapper) AllowPrivilegeEscalation() *bool { - if w.containerSC == nil { - return nil - } - return w.containerSC.AllowPrivilegeEscalation -} -func (w *containerSecurityContextWrapper) SetAllowPrivilegeEscalation(v *bool) { - if w.containerSC == nil && v == nil { - return - } - w.ensureContainerSC() - w.containerSC.AllowPrivilegeEscalation = v -} - -// NewEffectiveContainerSecurityContextAccessor returns an accessor for reading effective values -// for the provided pod security context and container security context -func NewEffectiveContainerSecurityContextAccessor(podSC PatchedPodSecurityContextAccessor, containerSC PatchedContainerSecurityContextMutator) PatchedContainerSecurityContextAccessor { - return &effectiveContainerSecurityContextWrapper{podSC: podSC, containerSC: containerSC} -} - -// NewEffectiveContainerSecurityContextMutator returns a mutator for reading and writing effective values -// for the provided pod security context and container security context -func NewEffectiveContainerSecurityContextMutator(podSC PatchedPodSecurityContextAccessor, containerSC PatchedContainerSecurityContextMutator) PatchedContainerSecurityContextMutator { - return &effectiveContainerSecurityContextWrapper{podSC: podSC, containerSC: containerSC} -} - -type effectiveContainerSecurityContextWrapper struct { - podSC PatchedPodSecurityContextAccessor - containerSC PatchedContainerSecurityContextMutator -} - -func (w *effectiveContainerSecurityContextWrapper) ContainerSecurityContext() *api.SecurityContext { - return w.containerSC.ContainerSecurityContext() -} - -func (w *effectiveContainerSecurityContextWrapper) Capabilities() *api.Capabilities { - return w.containerSC.Capabilities() -} -func (w *effectiveContainerSecurityContextWrapper) SetCapabilities(v *api.Capabilities) { - if !reflect.DeepEqual(w.Capabilities(), v) { - w.containerSC.SetCapabilities(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) Privileged() *bool { - return w.containerSC.Privileged() -} -func (w *effectiveContainerSecurityContextWrapper) SetPrivileged(v *bool) { - if !reflect.DeepEqual(w.Privileged(), v) { - w.containerSC.SetPrivileged(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) ProcMount() api.ProcMountType { - return w.containerSC.ProcMount() -} -func (w *effectiveContainerSecurityContextWrapper) SELinuxOptions() *api.SELinuxOptions { - if v := w.containerSC.SELinuxOptions(); v != nil { - return v - } - return w.podSC.SELinuxOptions() -} -func (w *effectiveContainerSecurityContextWrapper) SetSELinuxOptions(v *api.SELinuxOptions) { - if !reflect.DeepEqual(w.SELinuxOptions(), v) { - w.containerSC.SetSELinuxOptions(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) RunAsUser() *int64 { - if v := w.containerSC.RunAsUser(); v != nil { - return v - } - return w.podSC.RunAsUser() -} -func (w *effectiveContainerSecurityContextWrapper) SetRunAsUser(v *int64) { - if !reflect.DeepEqual(w.RunAsUser(), v) { - w.containerSC.SetRunAsUser(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) RunAsGroup() *int64 { - if v := w.containerSC.RunAsGroup(); v != nil { - return v - } - return w.podSC.RunAsGroup() -} -func (w *effectiveContainerSecurityContextWrapper) SetRunAsGroup(v *int64) { - if !reflect.DeepEqual(w.RunAsGroup(), v) { - w.containerSC.SetRunAsGroup(v) - } -} - -func (w *effectiveContainerSecurityContextWrapper) RunAsNonRoot() *bool { - if v := w.containerSC.RunAsNonRoot(); v != nil { - return v - } - return w.podSC.RunAsNonRoot() -} -func (w *effectiveContainerSecurityContextWrapper) SetRunAsNonRoot(v *bool) { - if !reflect.DeepEqual(w.RunAsNonRoot(), v) { - w.containerSC.SetRunAsNonRoot(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) ReadOnlyRootFilesystem() *bool { - return w.containerSC.ReadOnlyRootFilesystem() -} -func (w *effectiveContainerSecurityContextWrapper) SetReadOnlyRootFilesystem(v *bool) { - if !reflect.DeepEqual(w.ReadOnlyRootFilesystem(), v) { - w.containerSC.SetReadOnlyRootFilesystem(v) - } -} -func (w *effectiveContainerSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { - return w.containerSC.SeccompProfile() -} -func (w *effectiveContainerSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { - if !reflect.DeepEqual(w.SeccompProfile(), p) { - w.containerSC.SetSeccompProfile(p) - } -} -func (w *effectiveContainerSecurityContextWrapper) AllowPrivilegeEscalation() *bool { - return w.containerSC.AllowPrivilegeEscalation() -} -func (w *effectiveContainerSecurityContextWrapper) SetAllowPrivilegeEscalation(v *bool) { - if !reflect.DeepEqual(w.AllowPrivilegeEscalation(), v) { - w.containerSC.SetAllowPrivilegeEscalation(v) - } -} diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go index 8a13bce38c..247332c813 100644 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go +++ b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go @@ -100,7 +100,7 @@ func NewSimpleProvider(scc *securityv1.SecurityContextConstraints) (SecurityCont // on the PodSecurityContext it will not be changed. Validate should be used after the context // is created to ensure it complies with the required restrictions. func (s *simpleProvider) CreatePodSecurityContext(pod *api.Pod) (*api.PodSecurityContext, map[string]string, error) { - sc := NewPodSecurityContextMutator(pod.Spec.SecurityContext) + sc := securitycontext.NewPodSecurityContextMutator(pod.Spec.SecurityContext) annotationsCopy := copySS(pod.Annotations) @@ -149,9 +149,9 @@ func (s *simpleProvider) CreatePodSecurityContext(pod *api.Pod) (*api.PodSecurit // container's security context then it will not be changed. Validation should be used after // the context is created to ensure it complies with the required restrictions. func (s *simpleProvider) CreateContainerSecurityContext(pod *api.Pod, container *api.Container) (*api.SecurityContext, error) { - sc := NewEffectiveContainerSecurityContextMutator( - NewPodSecurityContextAccessor(pod.Spec.SecurityContext), - NewContainerSecurityContextMutator(container.SecurityContext), + sc := securitycontext.NewEffectiveContainerSecurityContextMutator( + securitycontext.NewPodSecurityContextAccessor(pod.Spec.SecurityContext), + securitycontext.NewContainerSecurityContextMutator(container.SecurityContext), ) if sc.RunAsUser() == nil { uid, err := s.runAsUserStrategy.Generate(pod, container) diff --git a/vendor/modules.txt b/vendor/modules.txt index 6a9e01c0a2..982db688a2 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-20240528110119-d099d1006d9d +# github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 ## 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-20240711114950-61de516d1eb1 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240711114950-61de516d1eb1 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240716152432-b9176556cda6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240716152432-b9176556cda6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240716152432-b9176556cda6 # 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-20240711114950-61de516d1eb1 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 From 638bac1639e0b36fbcaf130eaf010380c9fd46cd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:06 +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 eb7955b5d2..a4a72488e6 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-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240716152432-b9176556cda6 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240716152432-b9176556cda6 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240711114950-61de516d1eb1 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 2361bb69b3..24565e3a2a 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-20240711114950-61de516d1eb1 h1:Xt8xL0uECTYLmzcMvI161wEb8AucbGo7Fuv01cjmIqo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240711114950-61de516d1eb1/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 h1:mYDc4UDOdZSXnTfS3yLR1OXvKA+NomZhnDnqRwTITvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 h1:3qgoJQyuV4r9wYl1R96L3ZNLFc1TJiIZcHwtza5oMbg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 h1:Z7CGGrArPt6wjg9oVlGJWnmk9+s4oXwHpF/rg9D5Ork= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 h1:bffT66eSJVvE61fY0q4XCWbr/asLMoZaKy8phLBvlFU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 h1:JqgMshOxkRVvcVH5oDO9ajysLIFv6LuJ+ItBlJeDiFs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 h1:kYni2JPsd0s+OTJYchZxQupTdGhnAoEi8NapB6wHqnI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 h1:FY+Asf0rC+AVYBx3ERDwmt91C7LnEdgem/aFPK5hgAY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 h1:8gyHGvFsyJsbIpUbhgSoQPJCElDna9hqOW3zECLWgCM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 h1:qDQSO1bcMO6UtFFAcbVHc9RFesjCUaAlGQuySD2cwyw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 h1:Y89x4IPrrPTn1JdMLD5z52HeTGPEmmv4zQ47T1kENUg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 h1:1qu2fZbMKeO53d2RTgfCe9ZW665YhE+HOGpoB+kuw3U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 h1:6OG8HfpkWH3ED01iwC8RemlLk514Dunj5/1L8mli7Fo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 h1:cCHcYSdB7J/4M8aF7yYZdRuHTdeq8Zwxiy5JyXZd0ls= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6/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 0bd70d0b72efde5104d087dbfc28abe92615de86 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:12 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../openshift/microshift/pkg/config/config.go | 19 +++-- etcd/vendor/modules.txt | 74 +++++++++---------- 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go index ed5d833f90..76b773fb8b 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go @@ -119,14 +119,7 @@ func (c *Config) fillDefaults() error { BaseDomain: "example.com", } c.Network = Network{ - ClusterNetwork: []string{ - "10.42.0.0/16", - }, - ServiceNetwork: []string{ - "10.43.0.0/16", - }, ServiceNodePortRange: "30000-32767", - DNS: "10.43.0.10", } c.Etcd = EtcdConfig{ MemoryLimitMB: 0, @@ -270,6 +263,18 @@ func (c *Config) incorporateUserSettings(u *Config) { // inputs to more easily consumable units or fills in any defaults // computed based on the values of other settings. func (c *Config) updateComputedValues() error { + if len(c.Network.ClusterNetwork) == 0 && len(c.Network.ServiceNetwork) == 0 { + defaultClusterNetwork := "10.42.0.0/16" + defaultServiceNetwork := "10.43.0.0/16" + ip := net.ParseIP(c.Node.NodeIP) + if ip.To4() == nil { + defaultClusterNetwork = "fd01::/48" + defaultServiceNetwork = "fd02::/112" + } + c.Network.ClusterNetwork = []string{defaultClusterNetwork} + c.Network.ServiceNetwork = []string{defaultServiceNetwork} + } + clusterDNS, err := c.computeClusterDNS() if err != nil { return err diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index fe16880f9c..e1cfe9f487 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-20240711114950-61de516d1eb1 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 ## 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-20240711114950-61de516d1eb1 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240711114950-61de516d1eb1 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240711114950-61de516d1eb1 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240716152432-b9176556cda6 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240716152432-b9176556cda6 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240716152432-b9176556cda6 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240716152432-b9176556cda6 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240716152432-b9176556cda6 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240716152432-b9176556cda6 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240716152432-b9176556cda6 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240716152432-b9176556cda6 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240716152432-b9176556cda6 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240716152432-b9176556cda6 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240716152432-b9176556cda6 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240716152432-b9176556cda6 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240716152432-b9176556cda6 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240716152432-b9176556cda6 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240716152432-b9176556cda6 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240716152432-b9176556cda6 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240716152432-b9176556cda6 From 481ab5053ffc08dea368ced9baa4e0e917fa5f00 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:12 +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 0ffa85ac3c..35d2c16e0a 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:8a4fc384979d67f154ead455c6e9edbd4f59864c10bfb0bd4f7bfafdde85e93f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f08da393fb348d8c602280c703c7885bdbc9a3182d98dc7016c05f3e01c33064" 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 2ea3a29f28..f440a979f9 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:8d47677da68854575c87f0b545d6fde48135b10facf94f448c631cceca606914" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be06895e6fdae8228fa9b962d5d51a96c4cb03e32f39e2cc7edb718a5849d954" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 4aa4ee86a1504b36aced2d0e3f67c0909f67eb9d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:14 +0000 Subject: [PATCH 8/9] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../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 | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index e710a2aec2..12a22b5909 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-15-221845" + "base": "4.17.0-0.nightly-arm64-2024-07-16-204900" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 9352a06eef..771fbe6538 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.17.0-0.nightly-2024-07-15-034821" + "base": "4.17.0-0.nightly-2024-07-16-202442" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:993cc8b6336d06dcabdfa4b22f295f9b3211e054c7020f8d2cf411a54fc795ab", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index e4b91a3588..b84044d2ca 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.17.0-0.nightly-arm64-2024-07-15-221845" + "base": "4.17.0-0.nightly-arm64-2024-07-16-204900" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06", 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 decf222fe9..95e81e2f84 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.17.0-0.nightly-2024-07-15-034821" + "base": "4.17.0-0.nightly-2024-07-16-202442" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 3a616d67d3..81199faa10 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-15-221845" + "base": "4.17.0-0.nightly-arm64-2024-07-16-204900" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c42d318dd1abbaead33b881995181037ee170aa5c3073c09275fea0fdbacb2", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:319490525c6351b11f6646653d444f85428d08ade8521ad453990302e4afd41b", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a5ff0ab1bb3e344914ad50de86ea858e17cac24da5bbc061be287b46046760a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3db6babc1a28c99574b0f606fc3035d694ff68859581352356335c7a89481c4e", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:659ca58144cdf5a0a3b0d2e5d1c4c1a4b2a3ebbeb9c8c9364943504a658f4fc8", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d3a1e014dc92149acf5beee82933c9914c87563ee98f26936e601975957455", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d47677da68854575c87f0b545d6fde48135b10facf94f448c631cceca606914", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be06895e6fdae8228fa9b962d5d51a96c4cb03e32f39e2cc7edb718a5849d954", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff7539db47ad662df593fc13c4a95d73f4dc603e8743760063de1367725a731", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8559b1a5b8..77e996ee9c 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-15-034821" + "base": "4.17.0-0.nightly-2024-07-16-202442" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b50c2f8c02a8704e549a0bae94b85b98c32bbb1f41205f2733630b5da1f987f", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:280bcb34ddef25554a1c2f12c87de85fa91c2907dce36e54edbb1210c35567f7", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eea520c4f65f61acf8aff1e8fc8e6e61270fb75696517fe295dd7d5000b17dd8", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c878365260769346c72dc45d873810da37f881112e3ca76ac891cae0f240f569", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:881652d6daf58b9a7a9d186ec4f9d6c984921e3a86d46ecafa6da92b7f584bd4", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adb7f2c008bf38d587a38e216de79814ffaefa242e90bb4e09604778b78a9298", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a4fc384979d67f154ead455c6e9edbd4f59864c10bfb0bd4f7bfafdde85e93f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9066c4b3ee94829822dc2590c6a41b0157095023f687b3ef62688c1e2ad9e83", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f08da393fb348d8c602280c703c7885bdbc9a3182d98dc7016c05f3e01c33064", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3a607ca09b916b1884473a8f78275871b7b2a53b7971fbf7651cbf08c51729c", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", From 3076e4d8076a7df570c4916e68013a67594a1005 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:18:14 +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 a126685f0f..35338706da 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.2 -KUBE_GIT_COMMIT=61de516d1eb19a8e392045f2e1dbcf3bf8e8580c +KUBE_GIT_COMMIT=b9176556cda6da83643241a8eadbefd79fa50151 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index ff65cbb4a8..41896080c5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-15-221845 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-16-204900 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9c27c1a299..aebf89208c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-07-15-034821 +OCP_VERSION := 4.17.0-0.nightly-2024-07-16-202442