From b3aca20d3171dfc77097f8ee0660ad4d65ab1e76 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:07:14 +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 c8553ea077..c3fa9eae7b 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.16.0-0.nightly-2024-01-15-064322" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-21-154905" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927" From 2eac5a7bc3cd817d3eb4f5bebbc270115477ac71 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:07:15 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 118 ++++++++++++++++++++++-------- scripts/auto-rebase/commits.txt | 18 ++--- 2 files changed, 98 insertions(+), 38 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1da723033f..40193bb301 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,30 +1,90 @@ -- cluster-network-operator embedded-component 0196de9b213cf462c9f08685a72b58e22e862f85 to 45bc1ab8881c23f6bde187ea544861240925f632 - - 1bb16ff 2024-01-11T16:15:26+01:00 Render IPsec MachineConfig after cluster settles with MachineConfigs - - 97ba1b2 2023-12-19T17:53:38+01:00 remove microshift folder, since CNO doesn't manage it - -- kubernetes embedded-component 1e00cd0f1770004e5ce0e0394ae9cb378c0abc13 to 913d16a5d9fb76dfb617551d46b8c361a7128d3f - - da9dd58b5 2024-01-11T17:44:04+01:00 UPSTREAM: : update test rules - -- machine-config-operator embedded-component 8c4ca51b2f9c22c4dc14092166e0d454ba1401b7 to 81b767ca8e0379863bde61ba40f318afe57d292e - - 3f0a69f3 2024-01-03T16:40:55-05:00 OCPBUGS-5452: If node is not in pool, error - -- operator-framework-olm embedded-component 0081ef32987ed53e18b4bc48edc4919080238e1e to a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 - - 62d2a7c8 2024-01-12T07:30:54-07:00 go.mod: update metadata - - 9cf02638 2024-01-12T07:30:35-07:00 Updating operator-registry-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/bdea42c1a90f912d46961e65074c6a675cfb896b/images/operator-registry.yml - -- oc image-amd64 f3c090fb1f9ca2a57aa37cf58e2b80cf900d2abd to f5542cb40b186c17de4a2b7377584094f14fac97 - - 988a1757 2024-01-11T16:22:09-05:00 report kubectl version to the release controller - - f237103d 2024-01-11T15:33:31-05:00 add markdown representation of features - - 5b8c90f4 2024-01-11T13:19:41-05:00 add information about featuregate diff in a particular release - - 06d13215 2024-01-08T10:56:35+03:00 Skip rhel9 binary not found error for older releases - - 10b06af4 2024-01-05T09:41:25+03:00 Allow extracted binary name can be set to different - - 70101593 2024-01-04T16:53:14+03:00 Generate RHEL8 based oc and add as target to extract - - 129da484 2024-01-04T11:06:19+03:00 Add RHEL9 oc as linux command in target list - - e17fb41e 2024-01-04T11:06:19+03:00 Skip release-arch and arch type collision per command - -- router image-amd64 00f1690d49de86206bee1a54c9153747565b4186 to fcead817a0181a6326c15c8bd2e31b5fb3acdc14 - - ca7f0bb 2023-12-21T05:04:11+00:00 Updating ose-haproxy-router-base-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/ose-haproxy-router-base.yml - -- kubernetes image-amd64 1e00cd0f1770004e5ce0e0394ae9cb378c0abc13 to 913d16a5d9fb76dfb617551d46b8c361a7128d3f - - da9dd58b5 2024-01-11T17:44:04+01:00 UPSTREAM: : update test rules +- cluster-kube-apiserver-operator embedded-component 72a91de0baf62173c9d873165f6faf08deeb7214 to 31380bd1f08416d27b8978bcd91df27ea01419c3 + - 806b367 2024-01-10T15:32:53-05:00 update library-go to deconflict updates + - 1056020 2023-11-17T10:49:04-05:00 Add ownership for the admin kubeconfig + - 9612e26 2023-09-13T12:32:18+02:00 manifest: drop slo latency metrics in favor of sli + - 4304f3e 2023-09-13T12:26:16+02:00 bindata: update recording rules to use sli metric + +- cluster-kube-scheduler-operator embedded-component 092925fffd900a5ca71cd5075cd8d9e401b460be to 0966d5f841219e8732d469198ec2442de55b9350 + - 7a832d4 2024-01-18T10:24:42+01:00 readme: describe mapping between logLevel and log level + - 75af70a 2024-01-15T11:33:26+01:00 README: add notes about dumping KS's node cache + +- cluster-network-operator embedded-component 45bc1ab8881c23f6bde187ea544861240925f632 to e53cc1933c6b35ca1adb924f1f73dad2dc149d19 + - b81354d 2024-01-16T21:51:01-05:00 Only reconcile on Node updates with Label changes + - a8e1208 2024-01-15T16:24:57+02:00 Add the implementation of the new IPsec enablement API + - 621fb76 2024-01-12T20:09:08+02:00 Bump openshift/api and kubernetes dependencies to latest v0.29.0 + - 8bf8aa9 2024-01-12T20:09:08+02:00 Remove check not allowing to change ipsecConfig + - 133872b 2024-01-12T11:42:13-05:00 Fix jira component info + - c5aa153 2023-12-19T11:26:23+01:00 Remove egressip write permissions from ovn-kubernetes-node + - 94287c4 2023-12-08T11:06:27+01:00 Network node identity: tolarate all taints + +- kubernetes embedded-component 913d16a5d9fb76dfb617551d46b8c361a7128d3f to f629574ccc853fb3bdcf028dbee42352d12c2fa9 + - 79cb0c11b 2024-01-15T19:46:52+01:00 UPSTREAM: : use go.1.20 - revert + - dd2ebd8a2 2024-01-15T19:46:52+01:00 UPSTREAM: : switch to go1.21 + - acdc24336 2024-01-11T11:44:10+01:00 UPSTREAM: : Update management webhook pod admission logic + +- machine-config-operator embedded-component 81b767ca8e0379863bde61ba40f318afe57d292e to 139e1d0c2fa83658482bb37e443dec523d68c6dc + - 7b84adad 2024-01-17T12:33:08+00:00 Fix typo in AWS node env unit + - 43e668fe 2024-01-16T17:16:03-05:00 Fix mirrorSourcePolicy error prompt imagecontentsourcepolicies + - 2da4c764 2024-01-16T09:29:00+00:00 Add Image Credential Provider flags for Kubelet on AWS + - b2e9c86e 2024-01-12T09:36:26-06:00 add crio-kube-rbac-proxy + - 66004cdc 2024-01-10T11:42:20-05:00 use machine client instead of oc for teardown + - 98434a2b 2024-01-08T12:22:28-05:00 controller: change machineset arch detection + - a5f2eeec 2024-01-04T16:27:21-05:00 Update the design doc dual support icsp and idms + - a1e6058c 2024-01-02T14:46:50-08:00 pkg/operator/sync: Set apiVersion and kind in pool list response + - 0d57de27 2024-01-02T12:29:33-08:00 pkg/operator/sync: Set ownerReferences on *-user-data-managed Secrets + - d20ba0e9 2023-12-16T13:10:20+00:00 Updating ose-machine-config-operator-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-machine-config-operator.yml + - ba67a9c1 2023-12-05T10:48:50+01:00 OCPBUGS-22664: Mount /run/nodeip-configuration into coredns containers + +- operator-framework-olm embedded-component a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 to a9ea0bb2e0cb1479f70a19cca695d18c793e2aed + - 19ce0f19 2024-01-19T19:07:47+00:00 go.mod: bump to golang 1.21 + - 7ab63ab0 2024-01-19T19:06:57+00:00 go.mod: update golang to 1.21 (#1213) + - 8748220b 2024-01-19T19:06:10+00:00 include composite template builder's output path (#1208) + - ba34916d 2024-01-19T19:05:21+00:00 go.mod: bump golang to 1.21 (#3158) + - 751abffd 2024-01-19T19:04:32+00:00 Update golangci-lint to 1.54 (#3160) + - 42591fb3 2024-01-19T19:03:42+00:00 operators/olm: filter RBAC lists by namespace (#3157) + - 53871a37 2024-01-16T11:31:44-05:00 UPSTREAM: : Fix PSM + - 56ef2715 2024-01-16T11:26:46-05:00 Catch whitespace csv.spec.provider.name values (#272) + - 4e5c6dac 2024-01-16T11:26:46-05:00 [chore]: Re-bump opentelemetry to v1.20.0 (#310) + - 38f48707 2024-01-16T11:26:45-05:00 k8s 1.28 version update and go 1.20 (#292) + - fad53760 2024-01-16T11:26:45-05:00 build(deps): bump github.com/containers/common from 0.56.0 to 0.57.1 (#1200) + - 1add15c0 2024-01-16T11:26:45-05:00 build(deps): bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.13.2 (#1198) + - ce15db03 2024-01-16T11:26:45-05:00 build(deps): bump github.com/grpc-ecosystem/grpc-health-probe (#1197) + - c156a8fe 2024-01-16T11:26:45-05:00 build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8 (#1196) + - f8f4ab83 2024-01-16T11:26:44-05:00 build(deps): bump github.com/otiai10/copy from 1.2.0 to 1.14.0 (#1194) + - 9c60b163 2024-01-16T11:26:44-05:00 build(deps): bump github.com/mattn/go-sqlite3 from 1.14.17 to 1.14.19 (#1195) + - 604cdfd0 2024-01-16T11:26:44-05:00 updating operator-framework/api dependency which has k8s 1.28 changes (#1189) + - 0fe64d6e 2024-01-16T11:26:44-05:00 build(deps): bump actions/{download,upload}-artifact to v4 (#1193) + - a8b19cc2 2024-01-16T11:26:44-05:00 build(deps): bump docker/setup-qemu-action from 1 to 3 (#1181) + - 717074ec 2024-01-16T11:26:44-05:00 Update k8s dependencies to v0.28.5 (#1176) + - da7fcac5 2024-01-16T11:26:44-05:00 build(deps): bump golang.org/x/net from 0.19.0 to 0.20.0 (#1190) + - 78fdd4d6 2024-01-16T11:26:43-05:00 build(deps): bump github.com/golang-migrate/migrate/v4 (#1191) + - 40d4c06e 2024-01-16T11:26:43-05:00 build(deps): bump sigs.k8s.io/yaml from 1.3.0 to 1.4.0 (#1187) + - c85d8456 2024-01-16T11:26:43-05:00 build(deps): bump google.golang.org/grpc from 1.59.0 to 1.60.1 (#1186) + - fb21f428 2024-01-16T11:26:43-05:00 build(deps): bump actions/checkout from 3 to 4 (#1180) + - 14dcc083 2024-01-16T11:26:43-05:00 build(deps): bump docker/login-action from 1 to 3 (#1192) + - 9eec4b45 2024-01-16T11:26:42-05:00 build(deps): bump github.com/containerd/containerd from 1.7.6 to 1.7.11 (#1188) + - 35c8e6fc 2024-01-16T11:26:42-05:00 build(deps): bump github.com/h2non/filetype from 1.1.1 to 1.1.3 (#1185) + - 27bd4bd1 2024-01-16T11:26:42-05:00 build(deps): bump actions/setup-go from 4 to 5 (#1183) + - 7004d1c1 2024-01-16T11:26:42-05:00 enable dependabot (#1178) + - 746bbf17 2024-01-16T11:26:38-05:00 Update to k8s v0.28.5 and other operator-framework components (#3155) + - d0e80d64 2024-01-16T10:55:39-05:00 Fix Condition check for Reconcile InstallPlan status (#3153) + - 4667e9e8 2024-01-16T10:55:07-05:00 Add finalizer for CSV cleanup (#3148) + - c1744a00 2024-01-16T10:54:34-05:00 build(deps): bump github.com/containerd/containerd from 1.7.6 to 1.7.11 (#3135) + - 43b8f7e6 2024-01-16T10:54:00-05:00 build(deps): bump golang.org/x/crypto from 0.14.0 to 0.17.0 (#3134) + - 4626e196 2024-01-15T09:02:43+00:00 Updating operator-lifecycle-manager-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/4e1dc90e7fea4a86a748a2b25810d7a92641b2b5/images/operator-lifecycle-manager.yml + +- oc image-amd64 f5542cb40b186c17de4a2b7377584094f14fac97 to 96c31d999bf99059662faa00f13b1a04cfb8868b + - 7d23cbb6 2024-01-18T17:37:54+01:00 Write oc adm must-gather logs into a file + - 6348e4a0 2024-01-18T15:50:16+01:00 oc adm must-gather: pull gather container logs + - 1fc5c7d7 2024-01-17T16:45:47+01:00 pkg/cli/admin/mustgather: add since and since-time flags to limit logs + - ac637ff2 2024-01-16T17:35:04+01:00 adm update status: add TODOs to remind us to revise early decisions + - 7909d0dc 2024-01-16T12:30:23+01:00 pkg/cli/admin/inspect: use since/since-time for rotated logs + +- ovn-kubernetes image-amd64 be6c5c5ce948c6549b4b1308e770c3897dcd5576 to 824ac1002a4730bb2f93e4b371939f068948a35a + - f5865e2 2023-12-20T14:10:08-05:00 Dockerfile: Bump OVS to openvswitch3.1-3.1.0-73.el9fdp + +- kubernetes image-amd64 913d16a5d9fb76dfb617551d46b8c361a7128d3f to f629574ccc853fb3bdcf028dbee42352d12c2fa9 + - 79cb0c11b 2024-01-15T19:46:52+01:00 UPSTREAM: : use go.1.20 - revert + - dd2ebd8a2 2024-01-15T19:46:52+01:00 UPSTREAM: : switch to go1.21 + - acdc24336 2024-01-11T11:44:10+01:00 UPSTREAM: : Update management webhook pod admission logic diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index f8834b261a..60735cf529 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,30 +1,30 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cc14f55465a7600b4f4f2944fcb8cc4991486ecf https://github.com/openshift/cluster-dns-operator embedded-component 75c5dc17111dc498efd849f5a905b006681d8ddf https://github.com/openshift/cluster-ingress-operator embedded-component 9c62f2b499cc3d2f793370f42f85a9f158b3bf57 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 72a91de0baf62173c9d873165f6faf08deeb7214 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 31380bd1f08416d27b8978bcd91df27ea01419c3 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component fc039eb97932f5a4b1bcd4721860fe88eee36a08 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 092925fffd900a5ca71cd5075cd8d9e401b460be -https://github.com/openshift/cluster-network-operator embedded-component 45bc1ab8881c23f6bde187ea544861240925f632 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 0966d5f841219e8732d469198ec2442de55b9350 +https://github.com/openshift/cluster-network-operator embedded-component e53cc1933c6b35ca1adb924f1f73dad2dc149d19 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 83d2ca92d4cb9b242849590fd5d6530d31aeba5f https://github.com/openshift/cluster-policy-controller embedded-component efafeb428cb5fb95eb997873dc0d7c9d306df8f1 https://github.com/openshift/csi-external-snapshotter embedded-component 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/etcd embedded-component 66af0e5d532b10a23f6e40ec8cbafa0f275f6ee5 -https://github.com/openshift/kubernetes embedded-component 913d16a5d9fb76dfb617551d46b8c361a7128d3f +https://github.com/openshift/kubernetes embedded-component f629574ccc853fb3bdcf028dbee42352d12c2fa9 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 2646eac05dc16eac71d1d79509ed5800c437e0de -https://github.com/openshift/machine-config-operator embedded-component 81b767ca8e0379863bde61ba40f318afe57d292e +https://github.com/openshift/machine-config-operator embedded-component 139e1d0c2fa83658482bb37e443dec523d68c6dc https://github.com/openshift/openshift-controller-manager embedded-component 2a28a78279b127075b399a3442a2042f4a7d190d -https://github.com/openshift/operator-framework-olm embedded-component a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 +https://github.com/openshift/operator-framework-olm embedded-component a9ea0bb2e0cb1479f70a19cca695d18c793e2aed https://github.com/openshift/route-controller-manager embedded-component 95aa561e93876a3542db3c6aa64773ee98fefe39 https://github.com/openshift/service-ca-operator embedded-component 4d3d966edaaafcae7c9d4a1aa87a67ac627a6ebd -https://github.com/openshift/oc image-amd64 f5542cb40b186c17de4a2b7377584094f14fac97 +https://github.com/openshift/oc image-amd64 96c31d999bf99059662faa00f13b1a04cfb8868b https://github.com/openshift/coredns image-amd64 b6a657d656bef2631c4675a819ce25a4662b0978 https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/router image-amd64 fcead817a0181a6326c15c8bd2e31b5fb3acdc14 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 -https://github.com/openshift/ovn-kubernetes image-amd64 be6c5c5ce948c6549b4b1308e770c3897dcd5576 -https://github.com/openshift/kubernetes image-amd64 913d16a5d9fb76dfb617551d46b8c361a7128d3f +https://github.com/openshift/ovn-kubernetes image-amd64 824ac1002a4730bb2f93e4b371939f068948a35a +https://github.com/openshift/kubernetes image-amd64 f629574ccc853fb3bdcf028dbee42352d12c2fa9 https://github.com/openshift/service-ca-operator image-amd64 4d3d966edaaafcae7c9d4a1aa87a67ac627a6ebd https://github.com/openshift/oc image-arm64 f5542cb40b186c17de4a2b7377584094f14fac97 https://github.com/openshift/coredns image-arm64 b6a657d656bef2631c4675a819ce25a4662b0978 From 8ca6fcd1cf08eb05789eb37f9516829d6e72b6b1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:04 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 64 +++++++++++++-------------- go.sum | 134 +++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 114 insertions(+), 84 deletions(-) diff --git a/go.mod b/go.mod index 9f90244303..22ee4d6c0a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/microshift -go 1.20 +go 1.21 require ( github.com/apparentlymart/go-cidr v1.1.0 @@ -235,36 +235,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240111201904-913d16a5d9fb // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240111201904-913d16a5d9fb // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240116144113-f629574ccc85 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240116144113-f629574ccc85 // from kubernetes ) replace ( @@ -275,4 +275,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-2646eac05dc1 // 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-20240111201904-913d16a5d9fb // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 // staging kubernetes diff --git a/go.sum b/go.sum index c63e93653b..be7b4405b9 100644 --- a/go.sum +++ b/go.sum @@ -101,6 +101,7 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -136,6 +137,7 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI= github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0= github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= @@ -172,6 +174,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -182,14 +185,19 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= +github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -201,6 +209,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= @@ -213,6 +222,7 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= +github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -240,6 +250,7 @@ github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -248,6 +259,7 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -263,6 +275,7 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -371,6 +384,7 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWet github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -409,6 +423,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -418,6 +433,7 @@ github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wn github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -457,9 +473,11 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40= github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -485,60 +503,61 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240105153547-66af0e5d532b/go. github.com/openshift/etcd/client/v3 v3.5.1-0.20240105153547-66af0e5d532b h1:O3jdtpK8eoc6vlpVnlWVQhyPhsG4sMmsjLvTj0izRyY= github.com/openshift/etcd/client/v3 v3.5.1-0.20240105153547-66af0e5d532b/go.mod h1:a6xQUEqFJ8vztO1agJh/KQKOMfFI8og52ZconzcDJwE= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= -github.com/openshift/kubernetes v0.0.0-20240111201904-913d16a5d9fb h1:hbRNInQfWP0EQDUOigaboyVi1NJhvluRKW93UKzywFQ= -github.com/openshift/kubernetes v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:jntrW7pw09O5/MwCHMk5p6zF0jRC/f175thGZGop9Mc= +github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/openshift/kubernetes v0.0.0-20240116144113-f629574ccc85 h1:C0srSR97mETJhxaHM5o6L8QgEiF9oXSYAmyd22g15ds= +github.com/openshift/kubernetes v0.0.0-20240116144113-f629574ccc85/go.mod h1:yNG6QC0JMMFRWkhREB01if8JPAJ2wNvvDBiHqIFsXdE= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-2646eac05dc1 h1:CuWLmGiVO8yqy0Qm+ELyM6FYIgjXKbI+Gi2PunDc0Xw= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-2646eac05dc1/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb h1:3Icgib+i7dpflBc6zDxhJoAcQAAD5LUVCCD42i8C1FM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:jIA7p0o9ZPT7toqMn3uybfLrZBSYwgvo/FjmCQbYuRY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb h1:W9ddRw1584+CW7cGMWdjhWYaAoedQ+cfW4aB5cb4XwA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:s9UVpxu9s+TIMv0njnVPEKglzwZjFWMs8kpAlRQGWWk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb h1:KdJpM5od+NkFDVy+Xc80oPfWQZ275eA3oN1VoWuX9C4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:ALomArXKEopOev1HHZe/7M/baQDZfUqQWK5WJeRqMW4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb h1:dF8HA9uao6lfFsuOZhsMqwMub1NX8+eBI8Ihq/gjcBY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:/w4OcHTUGynq6HYcpJ7nnCC0lclUALmmkt8oRgtD/40= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb h1:VbVofFzgJ8mMQJDK4UhT/8qAiY/wVFCrZKfJNHznFvg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:jL1UD7RgErLct4ycvVLggeiUjUlXMMyDXOBjFlkRBHM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb h1:GV5h3JyJJKy+DViNiQKHMwQMTZDzNOky0lhRStUUxvY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:nKVXHBGIwRu9LKf6woSPoFxpEQr0Ay1FiGReJHZxNqI= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb h1:iqNzJ1HZXG6M0bVxsmo19LLh6Co7WzMzFAaJSQ5SgZU= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:X0fzBfhd1Xg0zANO5q2XpNalk56s1EnWM6oTZ+GXtwg= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb h1:7Wth1mUgBybzXVWW5Vexwh0F+p08X9F5xV0LkU9oy5Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:HzjL0AKA/t9YXUTOP3YitCDDu/PzqolnbRd3S5f8POI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb h1:La7SDCB1ozxczrwD/i4fqwNV5qa8/1mgmCpZrJtDETw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:X5koOgL4RUnrRUEfpRW75k2t9rV6YwbfHmU9K7yerOs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb h1:VONFd8BINx3OWLIL6dBo3GiMdY6BtcyPIUcfN+wGvSE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:2xetGGlXXcTdYV8mu4OQ82mKmINMiu804zLZq+DMMJA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb h1:1aOX8P2KuWXEJBcC2e7DIoNnOhpdB5w1tL0+r0aMzHA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:VlKTDnPD8cR1Zb+uZ2zhGCdsPGMceeICna/P5R/uXhc= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb h1:rW0uCnqF31janbOlB7EUHtVUCQhkCOxF58kclZ6tX5U= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:RHzWsuqvXO4+ksJ/nPA/mIL4FcmCuV+pEbjW0K6X0xU= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb h1:4uaSTlskr/jIPF4j7RvaIlt/IFqW8J5MeOnpOrY5Ux0= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:+ccWHlW5NAG/JkbZE9fNE4W1dnNCrcbsh0VUjbZ6vXk= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb h1:Y12N3tmqetRNsBg3QzIzllNHnKCUmSK7NUet7yxjEKM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:Dj4RwFhI1YCZ8J9P9qsRAtuM+Pv9ARTgUxTjYP8yTb0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb h1:pkyIx+PqXTWF3noTWR1DjZfAWrnXQ8abiau0RV71rYM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:K4w9Ve8xsKgb6WV5/2SdT8CUt0mS6Uibf9CpbpLRPV4= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb h1:8Zg4R+sAp3aAQVvqMHRLzkgiQQo20kvo9DfUokBBqKo= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:/S8hhDvLFCzn3w8no87dTZDXLfLEZqu6TWOEBX8MUs0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb h1:1kYFR5hD3wXBN1qp0aj1CwP75ldv2NFtgxvtcyth1Wg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:AAcBEPGh5EnQSXGVTjVz52tgdttay7qdx5/gcj5lvf8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb h1:q/jkTUJGktrHHgvl3X7tpdT7JAh/WZJQOIr7Q0ELeIs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:kY1WzHYGZrgwnV0Q2+CgDtd+48lDx7AT9xiLWWeKt7c= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb h1:7Mdf0c7SH7iO6byeNDKtjWi2UEDhttYaZLOZ1Lwcr1s= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:lxgsLeNSWXZdgt5uIiegiII2rreuIlWk2JeG4vmVhIY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb h1:lwnlglH17lfoX/E1iQW4C+b/iYjfKDwr7X/5jNAhMMc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:DziQ8nZdXWECvrW0xgYnTkyIlGgMeFfubWTmzGFqpec= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb h1:0iqJ5dvEnFi/eu3uDa3zZNrf46vZI8k8FKdc5WKQvak= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:3cjiYQVlbDf5yZmai3lh7+q7EO9jTcwGaW+pUlaz3U8= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb h1:yZj1ToWN199Huz8Bhnvd4YWP1LTwtSq8lpN03nRraiI= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:pH6Bk5oei/OrrSU9YBnAiB2My101IRHTLaPfLcjXPsQ= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb h1:RbLm/eM0DmQmWFPCAyl/nznt31qlLBllelAUVHX9zys= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:pyYhm1OwjG0JPOgOnG4pCRHT9SM6brzamlZlekn7xeM= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb h1:szoxuJ9EGMPSazDFrRj2AgbF4UFWyIBC6TVcOI1rcLs= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:chyWAYyzWVtRfdFC6CV2UWaQ323Ia5HnIfUDVlYufD0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb h1:/lOYKSXN6N4EpN7tyDKqFYgxjvIGAwNPRkQm0CYcQfU= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:qYhx4A7YDlDFxdOjBQC5cXYZVavthnNYiOYIPkOwM0Y= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 h1:+kzdkP3FuDl+rI0YLHQkTBZm4ZWn9329TkfKWfYqoRY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85/go.mod h1:ZBN4/S4MbHiQ6oVpPHpK9D8ChXcwbBS5xI7p/lK4GBs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 h1:LHyEAdhfdsi81M7hGmZ8+FzHikFRW2F0byIAGi3SO0I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85/go.mod h1:DisqHjmX6oOa7RdycSRpwt3dKhMP5iHfZytpNqoI3xk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 h1:INf2OjagFUqLetrTTfaEj9aSyE3FqUDCuVNqZq1TbUI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85/go.mod h1:byKq84+2PjN9dsDfG+qtD2Q2UnVVugtrssD/lAWDDO0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 h1:K2zy7y8CR56Xf1/xEmJkDIc1WvSowY0bQCyXFB854Q0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85/go.mod h1:Q3w0zL+o5AeCOaNloGQBJd6xS5KMflApdhLQsRYtUpA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 h1:SLKMEXS+obkWlbtRB51Bx9CDnoH11bUv9Q/OyCWdJ7M= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85/go.mod h1:569BaPI2R9NLU6wTDlvsUE9QdWNrc2N1bvJLq6IJ288= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 h1:iD2QVg5lnrndPwEWo2Ewp9kV6kv1wDeBM07f7RT8p3E= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85/go.mod h1:eON2FXoZiy5q4NFLS0IF5OJmrwJtYeYXHq5zLGdptwI= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 h1:frNzAAx0ewLbAzsIfVkN4n/YLN61IiGlSSemKM2YCwY= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85/go.mod h1:DaroLQCHvtJ45/pyg/9EJ7IV3weo1LOY46fyTZXnD9k= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 h1:ocJJ5bjWaors8Pp195avIBd9dPQn+3JN7rlPOpctaNs= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85/go.mod h1:RG0v3Em7qTakkrO1xzR71TI1EmqnMwyqw4gtetWexvU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 h1:FJvLVBw0l1CAY/Mmw8ZsOlEFUC7P5R1HOR/XnoVX6h0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85/go.mod h1:OoLZLRu8iW8ez0arkv2rXNJFjPr+qgvTxgw+2muyVfw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 h1:9ax6arQJeoy64grt5UqS8MkG/vv2xiJE3XKS+c+6/Aw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85/go.mod h1:6F1B8OzEGK7I6/Pll2OrplhaEHWtNQ6DAN+/L4zplPI= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 h1:J3JzCiS9PeJ5voxdaoEz/D9rqVErvt4vBPsZ6Xe2lc0= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85/go.mod h1:1bQe9QDGYKbtzBvnYQIF35xHQiN3E3+w3VL85XMMpwY= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 h1:Xwk+duDNaGcANhgARbenmhktgY6dX+y1Avzc+SAykwg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85/go.mod h1:inilmNAvSChktQm94KP+MNob/cllXUcKfDBcdo8tQ8w= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 h1:hpSnDHmDUzeAE+cvWyCseFqEk98bJ6WKWFyyLDsfQD0= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85/go.mod h1:NU/aNep1VWdlUiCvEbRf7QeBeRyZQdwCTE9nQ438x/E= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 h1:rZBagakr7Fw8MigyKyYW7XjXOF4Mv7tCWrFmGoLc8+s= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85/go.mod h1:yigRLYaw75BRA7XXtGl73t7mV5UJCchzcAz5C6hNX6A= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 h1:BfraaYMCwIz//C435tyDmUvyv67TzL05ezFghPZptsk= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85/go.mod h1:j5zWibKKgjTCJ83jy20njaPVEnzXCRFBcR8eSg7C4xY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 h1:x2tl3vCgsadPf2fRZC27sOU4vUp6JKBZyqe42lbgfeg= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85/go.mod h1:nXsHtCumTpVqyGHvk3oczh5AChJp3vZT2ogtNTup+/4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 h1:0fLyYPDcwQSz1ThIn1x5pCzn8jXSfmkcp2AAiOYc4HE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85/go.mod h1:gexXFSqFhQDACxdePTd5zIPFl7CGYeMNBP73ASRMHNI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 h1:jLhryxZPiHe1qnWfjrnwZC3X7aSoWJ93+p4s9lCbjms= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85/go.mod h1:MCvKxyw3A3GKGu64EGvqS3PG05wiiqyDkhCuzlxNMbI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 h1:qbuKTOZDpdoKD01+QhSZJ7BJw4IOCVpxQuHbPCU5D2c= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85/go.mod h1:lPsKNMMYwEg9HzSyOT6JOB/i89p7qRJmGOrSLu5oN38= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 h1:B2HFDjDRjitS7XQgh0Tu88gX8g8zfsjlw9Y7fXlPjGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85/go.mod h1:HrftPFHzhPPbfzVgYzBEVprtiaV9gPuYe0iwIARWp9w= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 h1:vWGAjwe21RRjqD77s1KAcFDrPlsqNHZH5tSXoIMPhA0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85/go.mod h1:BBwrn0jtvZfah0yZnotQtxf/OUeeOKEGt80avwyPCt8= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 h1:1+vMDw4UEG6pBNE4/RFMuKmpg0MM3gHoMcD3fP7JnTk= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85/go.mod h1:H5SZLu6GJUe0XuxutcXipr67RWZDdNTlPcVmmFjGcdk= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 h1:ZaN60hMIPthM31FhLGSWmgkd/RsHnn1/arcYX/iKSf4= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85/go.mod h1:pmJX4TNLsw64+Y1yOlF8GFlMSX6t6e8PcnFZkBlhJVU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 h1:sH4F5suO4tf9l/VPaat+DXLpAWwLGmVyoVBz5xvbq4Y= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85/go.mod h1:idwLUyLO6yGtSiwBZWFs8rClobD5pLu/rQCToDwnGM0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 h1:CkWlOC68fx4NPBbO1CHlnSAj4y9MzO/9IjPH2KVK+n4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85/go.mod h1:4H70e8Wa2I7TDgQyTAcTTiZXvVWHg4Z5z2p1gnN41Vo= github.com/openshift/library-go v0.0.0-20231218143352-99cedb2a141c h1:Onc1C9RWubJj88Jye/giWg2dbbTdMkRGvdekIWBzqTE= github.com/openshift/library-go v0.0.0-20231218143352-99cedb2a141c/go.mod h1:3taNPDhXab1SAcKteUtv5T7VEYeHJxa5xfHqfnHPEKY= github.com/openshift/route-controller-manager v0.0.0-20240105122523-95aa561e9387 h1:HJiRNYIVIITFboGz+c7VbJTiPoeiDC/+ypxVfwJuMvA= @@ -583,6 +602,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 h1:if3/24+h9Sq6eDx8UUz1SO9cT9tizyIsATfB7b4D3tc= github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -591,6 +611,7 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/seccomp/libseccomp-golang v0.10.0 h1:aA4bp+/Zzi0BnWZ2F1wgNBs5gTpm+na2rWM6M9YjLpY= github.com/seccomp/libseccomp-golang v0.10.0/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -599,6 +620,7 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -633,6 +655,7 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= @@ -655,10 +678,15 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= +go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4= +go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA= go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM= +go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs= go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA= +go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc= go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg= +go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -675,6 +703,7 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= +go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= @@ -698,6 +727,7 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= From 3a260dc3fb6d0988f4d47e62a26ffb61db18cd26 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:31 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../managementcpusoverride/admission.go | 12 +- vendor/modules.txt | 166 +++++++++--------- 2 files changed, 94 insertions(+), 84 deletions(-) diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go index 6743054742..c0a0ce074b 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go @@ -217,6 +217,13 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri return err } + if _, found := ns.Annotations[namespaceAllowedAnnotation]; !found && len(workloadType) > 0 { + pod.Annotations[workloadAdmissionWarning] = fmt.Sprintf( + "skipping pod CPUs requests modifications because the %s namespace is not annotated with %s to allow workload partitioning", + ns.GetName(), namespaceAllowedAnnotation) + return nil + } + if !doesNamespaceAllowWorkloadType(ns.Annotations, workloadType) { return admission.NewForbidden(attr, fmt.Errorf("%s the pod namespace %q does not allow the workload type %s", PluginName, ns.Name, workloadType)) } @@ -449,10 +456,13 @@ func podHasBothCPULimitAndRequest(containers []coreapi.Container) bool { return false } +// doesNamespaceAllowWorkloadType will return false when a workload type does not match any present ones. func doesNamespaceAllowWorkloadType(annotations map[string]string, workloadType string) bool { v, found := annotations[namespaceAllowedAnnotation] + // When a namespace contains no annotation for workloads we infer that to mean all workload types are allowed. + // The mutation hook will strip all workload annotation from pods that contain them in that circumstance. if !found { - return false + return true } for _, t := range strings.Split(v, ",") { diff --git a/vendor/modules.txt b/vendor/modules.txt index 629de47601..3d00759b41 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1362,8 +1362,8 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/api v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -1419,8 +1419,8 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install @@ -1466,8 +1466,8 @@ 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/apimachinery v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -1533,8 +1533,8 @@ 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel k8s.io/apiserver/pkg/admission/configuration @@ -1701,14 +1701,14 @@ k8s.io/apiserver/plugin/pkg/audit/webhook 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/client-go v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -2045,8 +2045,8 @@ 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/cloud-provider k8s.io/cloud-provider/api k8s.io/cloud-provider/app/config @@ -2068,15 +2068,15 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/component-base v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag @@ -2109,8 +2109,8 @@ 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/component-helpers v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget k8s.io/component-helpers/auth/rbac/reconciliation @@ -2122,8 +2122,8 @@ 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/controller-manager v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/controller-manager/app k8s.io/controller-manager/config k8s.io/controller-manager/config/v1 @@ -2139,20 +2139,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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache @@ -2175,14 +2175,14 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kms v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kms v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kube-aggregator v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 @@ -2212,8 +2212,8 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 ## explicit; go 1.19 @@ -2245,12 +2245,12 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources k8s.io/kubectl/pkg/cmd/apply @@ -2284,8 +2284,8 @@ 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kubelet v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 k8s.io/kubelet/config/v1beta1 @@ -2306,8 +2306,8 @@ 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.29.0 => github.com/openshift/kubernetes v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kubernetes v1.29.0 => github.com/openshift/kubernetes v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options k8s.io/kubernetes/cmd/kube-controller-manager/app @@ -3105,8 +3105,8 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth k8s.io/legacy-cloud-providers/azure/cache @@ -3147,8 +3147,8 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 k8s.io/metrics/pkg/apis/custom_metrics/v1beta2 @@ -3162,11 +3162,11 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api k8s.io/pod-security-admission/admission/api/load @@ -3316,38 +3316,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/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240111201904-913d16a5d9fb +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240116144113-f629574ccc85 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240116144113-f629574ccc85 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240116144113-f629574ccc85 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240105153547-66af0e5d532b # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240105153547-66af0e5d532b # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240105153547-66af0e5d532b # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-2646eac05dc1 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 From fc7dfd7e0840ff11820be397acb904976ba573e9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:31 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 64 +++++++++++++++++++++++++++-------------------------- etcd/go.sum | 43 +++++++++++++++++++++++++---------- 2 files changed, 64 insertions(+), 43 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index bf776a6c34..7cb7fdd95e 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -1,6 +1,8 @@ module github.com/openshift/microshift/etcd -go 1.20 +go 1.21 + +toolchain go1.21.3 require github.com/openshift/microshift v0.0.0 @@ -146,35 +148,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240116144113-f629574ccc85 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240116144113-f629574ccc85 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 4e9ee8c193..40329ba9b8 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -2,7 +2,9 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -12,6 +14,7 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -31,7 +34,9 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= @@ -39,6 +44,7 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -51,6 +57,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= @@ -66,6 +73,7 @@ github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -74,6 +82,7 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -81,6 +90,7 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -113,6 +123,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -148,6 +159,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -176,6 +188,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c h1:H5k87xq6hGgR1YCF/8hLv3j5jWd64Eh3ZhqF9WUJ15Q= github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/etcd/api/v3 v3.5.1-0.20240105153547-66af0e5d532b h1:JQNvyhnIG+dhXOEelB9+H/1efx1P8E7RGeIyq0P6sJg= @@ -191,18 +204,19 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240105153547-66af0e5d532b/go.mod h1 github.com/openshift/etcd/server/v3 v3.5.1-0.20240105153547-66af0e5d532b h1:O9M7aRqFIEDg5Uq90i7pKPHQSUdZtgXhYIlIlL8R1LM= github.com/openshift/etcd/server/v3 v3.5.1-0.20240105153547-66af0e5d532b/go.mod h1:CS0+TwcuRlhg1I5CpA3YlisOcoqJB1h1GMRgje75uDs= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb h1:3Icgib+i7dpflBc6zDxhJoAcQAAD5LUVCCD42i8C1FM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:jIA7p0o9ZPT7toqMn3uybfLrZBSYwgvo/FjmCQbYuRY= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb h1:KdJpM5od+NkFDVy+Xc80oPfWQZ275eA3oN1VoWuX9C4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:ALomArXKEopOev1HHZe/7M/baQDZfUqQWK5WJeRqMW4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb h1:VbVofFzgJ8mMQJDK4UhT/8qAiY/wVFCrZKfJNHznFvg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:jL1UD7RgErLct4ycvVLggeiUjUlXMMyDXOBjFlkRBHM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb h1:GV5h3JyJJKy+DViNiQKHMwQMTZDzNOky0lhRStUUxvY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:nKVXHBGIwRu9LKf6woSPoFxpEQr0Ay1FiGReJHZxNqI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb h1:La7SDCB1ozxczrwD/i4fqwNV5qa8/1mgmCpZrJtDETw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:X5koOgL4RUnrRUEfpRW75k2t9rV6YwbfHmU9K7yerOs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb h1:lwnlglH17lfoX/E1iQW4C+b/iYjfKDwr7X/5jNAhMMc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb/go.mod h1:DziQ8nZdXWECvrW0xgYnTkyIlGgMeFfubWTmzGFqpec= +github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 h1:+kzdkP3FuDl+rI0YLHQkTBZm4ZWn9329TkfKWfYqoRY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85/go.mod h1:ZBN4/S4MbHiQ6oVpPHpK9D8ChXcwbBS5xI7p/lK4GBs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 h1:INf2OjagFUqLetrTTfaEj9aSyE3FqUDCuVNqZq1TbUI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85/go.mod h1:byKq84+2PjN9dsDfG+qtD2Q2UnVVugtrssD/lAWDDO0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 h1:SLKMEXS+obkWlbtRB51Bx9CDnoH11bUv9Q/OyCWdJ7M= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85/go.mod h1:569BaPI2R9NLU6wTDlvsUE9QdWNrc2N1bvJLq6IJ288= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 h1:iD2QVg5lnrndPwEWo2Ewp9kV6kv1wDeBM07f7RT8p3E= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85/go.mod h1:eON2FXoZiy5q4NFLS0IF5OJmrwJtYeYXHq5zLGdptwI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 h1:FJvLVBw0l1CAY/Mmw8ZsOlEFUC7P5R1HOR/XnoVX6h0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85/go.mod h1:OoLZLRu8iW8ez0arkv2rXNJFjPr+qgvTxgw+2muyVfw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 h1:B2HFDjDRjitS7XQgh0Tu88gX8g8zfsjlw9Y7fXlPjGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85/go.mod h1:HrftPFHzhPPbfzVgYzBEVprtiaV9gPuYe0iwIARWp9w= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -222,9 +236,11 @@ github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+Pymzi github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= @@ -248,6 +264,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= @@ -284,6 +301,7 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -367,6 +385,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From e9d3c564f89260f8364f84127276a3215adb4d83 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:37 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../openshift/microshift/pkg/config/config.go | 25 ++++++ etcd/vendor/modules.txt | 86 +++++++++---------- 2 files changed, 68 insertions(+), 43 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 9ff785c2e4..e5c999a0e8 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/config.go @@ -279,6 +279,13 @@ func (c *Config) validate() error { ) } + if c.ApiServer.SkipInterface { + err := checkAdvertiseAddressConfigured(c.ApiServer.AdvertiseAddress) + if err != nil { + return err + } + } + return nil } @@ -316,3 +323,21 @@ func getAllHostnames() ([]string, error) { allHostnames = set.List() return allHostnames, nil } + +func checkAdvertiseAddressConfigured(advertiseAddress string) error { + addrs, err := net.InterfaceAddrs() + if err != nil { + return err + } + for _, addr := range addrs { + // interface addresses come with the mask at the end. + addrStr := addr.String() + if idx := strings.Index(addrStr, "/"); idx != -1 { + addrStr = addrStr[:idx] + } + if addrStr == advertiseAddress { + return nil + } + } + return fmt.Errorf("Advertise address: %s not present in any interface", advertiseAddress) +} diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 3bcc9197c6..34528bfa59 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -201,7 +201,7 @@ github.com/openshift/build-machinery-go/make/targets/openshift github.com/openshift/build-machinery-go/make/targets/openshift/operator github.com/openshift/build-machinery-go/scripts # github.com/openshift/microshift v0.0.0 => ../ -## explicit; go 1.20 +## explicit; go 1.21 github.com/openshift/microshift/pkg/config github.com/openshift/microshift/pkg/util github.com/openshift/microshift/pkg/util/cryptomaterial @@ -602,8 +602,8 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/api v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -659,8 +659,8 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/apimachinery v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -713,14 +713,14 @@ 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/client-go v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -866,8 +866,8 @@ 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/component-base v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag k8s.io/component-base/featuregate @@ -901,8 +901,8 @@ 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-20240111201904-913d16a5d9fb -## explicit; go 1.20 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 +## explicit; go 1.21 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util/i18n @@ -1029,33 +1029,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240105153547-66af0e5d532b # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240105153547-66af0e5d532b # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240105153547-66af0e5d532b -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240111201904-913d16a5d9fb -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240116144113-f629574ccc85 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240116144113-f629574ccc85 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240116144113-f629574ccc85 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 From d6f8aa00921c84d7cb02ff61dfc2f80922476294 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:38 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 18dc028125..5eabeb29f5 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/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:396b1e84eab727a71805eb1d50054d1957bacb57f16691e6ca69552893ea491d" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22484c12834a34f5421b772a24696a44ac1dbfa22102bf29dce00a38068d0b9a" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 00069de789f7e12d80a47f60641ae8856e494027 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:40 +0000 Subject: [PATCH 8/9] update manifests --- ..._50_olm_00-clusterserviceversions.crd.yaml | 27 ++++++++++++------- .../kustomization.x86_64.yaml | 10 +++---- .../release-olm-x86_64.json | 8 +++--- assets/release/release-x86_64.json | 10 +++---- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml index 00b8283f01..1bbd7802f2 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml @@ -1732,6 +1732,9 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + restartPolicy: + description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.' + type: string securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' type: object @@ -1798,7 +1801,7 @@ spec: - type properties: localhostProfile: - description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost". + description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied." @@ -1814,7 +1817,7 @@ spec: description: GMSACredentialSpecName is the name of the GMSA credential spec to use. type: string hostProcess: - description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. + description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. @@ -2576,6 +2579,9 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + restartPolicy: + description: Restart policy for the container to manage the restart behavior of each container within a pod. This may only be set for init containers. You cannot set this field on ephemeral containers. + type: string securityContext: description: 'Optional: SecurityContext defines the security options the ephemeral container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.' type: object @@ -2642,7 +2648,7 @@ spec: - type properties: localhostProfile: - description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost". + description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied." @@ -2658,7 +2664,7 @@ spec: description: GMSACredentialSpecName is the name of the GMSA credential spec to use. type: string hostProcess: - description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. + description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. @@ -3431,6 +3437,9 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + restartPolicy: + description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.' + type: string securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' type: object @@ -3497,7 +3506,7 @@ spec: - type properties: localhostProfile: - description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost". + description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied." @@ -3513,7 +3522,7 @@ spec: description: GMSACredentialSpecName is the name of the GMSA credential spec to use. type: string hostProcess: - description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. + description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. @@ -3751,7 +3760,7 @@ spec: description: ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod. type: string resourceClaimTemplateName: - description: "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod. \n The template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The name of the ResourceClaim will be -, where is the PodResourceClaim.Name. Pod validation will reject the pod if the concatenated name is not valid for a ResourceClaim (e.g. too long). \n An existing ResourceClaim with that name that is not owned by the pod will not be used for the pod to avoid using an unrelated resource by mistake. Scheduling and pod startup are then blocked until the unrelated ResourceClaim is removed. \n This field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim." + description: "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod. \n The template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses. \n This field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim." type: string x-kubernetes-list-map-keys: - name @@ -3825,7 +3834,7 @@ spec: - type properties: localhostProfile: - description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost". + description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied." @@ -3863,7 +3872,7 @@ spec: description: GMSACredentialSpecName is the name of the GMSA credential spec to use. type: string hostProcess: - description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. + description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index ba32c56bfe..173e934bf8 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b + digest: sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001 + digest: sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4 + digest: sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8 target: kind: Deployment labelSelector: app=catalog-operator 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 cac770e8d6..1a6c0bee69 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-2024-01-15-064322" + "base": "4.16.0-0.nightly-2024-01-21-154905" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 83214d8911..9f8d5e0fed 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.16.0-0.nightly-2024-01-15-064322" + "base": "4.16.0-0.nightly-2024-01-21-154905" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a64d832bcde9df5e4304a74f0092863195c8034728978b25779c5cbf2faf474", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cd382c1ccc8edfd3c3a6ff7ca53adba06cb23364099ef5e4a897b4140f9e7ac", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4ce7746dad80ba7b47c6f5c7469d74fe5cab5f11ef56d8f4b3b70da3a47a889", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e6ce90cff3f4c99818d3219403980b164a4823ef570111c2f7afd4c336491c6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c07e860448ca5fb0401fd8e556419055297991fec79362d3bbcb3ddedce77b4", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:396b1e84eab727a71805eb1d50054d1957bacb57f16691e6ca69552893ea491d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b7337b188924c0c77ab64dc005b376934e43f4e8474d710e7805917158388d", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22484c12834a34f5421b772a24696a44ac1dbfa22102bf29dce00a38068d0b9a", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80591b390106c5503bc1c4328a6a086d13b746a7fc0b65d81964f1aefba0b292", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", From 7b1b10ba1c477a48a7c6b4e638f6d22591a6606c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jan 2024 05:08:43 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 2f1d3decdc..cafe0fa363 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=29 KUBE_GIT_VERSION=v1.29.0 -KUBE_GIT_COMMIT=913d16a5d9fb76dfb617551d46b8c361a7128d3f +KUBE_GIT_COMMIT=f629574ccc853fb3bdcf028dbee42352d12c2fa9 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 0d393e6c18..3a3bbf0268 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-01-15-064322 +OCP_VERSION := 4.16.0-0.nightly-2024-01-21-154905