From 07232b392e2d7c288640374592a400094990088c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:09:26 +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 2c04656d6c..001a9a5b13 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.14.0-0.nightly-2023-06-15-064008" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-16-015443" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-18-111801" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-18-233314" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From a63a39477e4bd4d417676dd4032c275017565680 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:09:26 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 259 +++++------------------------- scripts/auto-rebase/commits.txt | 14 +- 2 files changed, 51 insertions(+), 222 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6ee5b33609..358c130357 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,229 +1,58 @@ -- cluster-ingress-operator embedded-component e068d04e01cca70be8efb0a595188835525b4792 to 0e500e647303c6a63a7077de4a3d465d45f683d2 - - 7251aaa 2023-06-06T12:51:22-04:00 Add support for AWS shared VPC in another account - - 56a4055 2023-06-06T09:11:46-04:00 Bump openshift/api for PrivateHostedZoneAWS - -- cluster-network-operator embedded-component 6cf62caf70d0a5905511b1f85e204bad7e57903c to 5b8884021f201dbe7784c13dbc5e6939a70d5b44 - - 529def9 2023-06-12T12:42:18+02:00 Do not determine if HyperShift is enabled based on the ControlPlaneTopology value - - 19c0dc9 2023-05-30T15:59:15-07:00 Add necessary manifest changes for cloud-network-config-controller - -- machine-config-operator embedded-component 6511a6d5b008459e9d7126bdd154c06eddb3d8aa to 3d84f653e08d760d446442ddc80c3da21d8d7e59 - - 28c26ea8 2023-05-18T18:00:37+02:00 OpenStack: configure ipv6 addresses - -- oc image-amd64 4e136762ec0ea7216f04665eb983ca30633b1f9f to c7a312c09ad02847322b3237d4222c51fcf9db4e - - 758b5c35 2023-06-14T19:32:06+02:00 pernodepod: percent works like this - - 89c64979 2023-06-14T16:55:19+02:00 ocpcertificates: don't make assumptions on resources not to bring piping from -oname commands - - 207976bb 2023-06-14T12:58:45+02:00 clusteroperator,ocpcertificates: add command descriptions and examples - - 6cdb77f6 2023-06-14T10:27:36+02:00 waitforstable: fix typo in minimum-stable-period flag - - 0885b3c9 2023-06-14T10:06:55+02:00 ocpcertificates: fix handling resources by names explicitly - - 83d4101b 2023-06-13T18:45:45-04:00 add new kubelet bootstrap command - - e64e7bd0 2023-06-13T16:32:55-04:00 add directives and fix percentage node calculation - - c41e53ec 2023-06-13T16:14:04-04:00 skip unready nodes quickly - - b97709a6 2023-06-13T16:02:40-04:00 add the option to add a command when restarting kubelets - - 9722dda5 2023-06-13T17:03:35+02:00 trustpurge: use RetryOnConflict for conflict handling - - 1b15e234 2023-06-13T10:07:53-04:00 add newline between polls to make it easier to read by hu9mans - - 6fd3c946 2023-06-13T10:04:49-04:00 update output to make the wait easier to see and print all proceeding operators - - e7ae218b 2023-06-13T16:04:23+02:00 ocpcertificates: hardcode resources to use with given commands - - c1c8a43c 2023-06-13T16:04:22+02:00 trustpurge: allow excluding ca-bundles - - dc2d78de 2023-06-13T16:04:22+02:00 trustpurge: move to Update, retry on Update() conflicts - - 008cde4b 2023-06-13T16:04:22+02:00 ocpcertificates: add the 'remove-old-trust' subcommand - - a9eea729 2023-06-13T16:04:22+02:00 certregen: return error on failed apply to stop from further progressing - - 38d9a8fa 2023-06-13T16:04:22+02:00 certregen: add unit tests for leaf cert regen - - 7f7be0ae 2023-06-13T16:04:09+02:00 certregen: only generate 2048 bit keys to speed up tests - - 4d4c49ca 2023-06-13T09:42:18-04:00 update wait for stability to handle short durations - - 91393bbd 2023-06-13T09:23:40-04:00 update for comments - - 7380acd1 2023-06-13T07:20:36-04:00 include new shell escaping dependency - - 636d40fc 2023-06-13T07:07:22-04:00 create command to create new adminkubeconfig - - 480437d8 2023-06-12T19:08:14-04:00 add a command to copy content to every node - - f7f6eee3 2023-06-12T17:58:03-04:00 refactor the restart kubelet to extract PerNodePod commands - - 61cc186c 2023-06-12T15:55:26-04:00 Minor updates to CLI help text - - 32d7dfc6 2023-06-12T16:07:35+02:00 add leaf certs regen, reusing the original logic for toplevel - - c049419c 2023-06-12T16:06:39+02:00 remove previous testing proposal - - a9e42596 2023-06-12T09:03:05-04:00 add kubelet restart - - 9c890a84 2023-06-09T13:28:28-04:00 add command to restart kubelets - - 744cbd0a 2023-06-09T13:16:00+02:00 vendor in fake confiv1client for testing - - 48a2359a 2023-06-09T13:15:59+02:00 add a command to wait for the cluster to become stable - -- ovn-kubernetes image-amd64 8f60d8256d695de33219c36fc3b83a924264eddf to 23c67c62ed1d912387791a1d8eb422b367c422dc - - ece5840 2023-06-13T21:48:59+02:00 Use the old leadership lock name for global zone - - 52ac333 2023-06-13T21:48:32+02:00 Fix podIPs not found on IC - - 5d2d473 2023-06-07T14:35:19+02:00 Stop using a waitgroup in route manager - - dcd5003 2023-06-06T15:24:45+02:00 Update OCPHACKs to use nodeipt pkg - - 214b3ba 2023-05-23T17:36:20+02:00 Pretty print CPUSet - - 1286207 2023-05-23T17:36:20+02:00 Add smoke tests for OVS CPU affinity pinning - - 46d2ce5 2023-05-23T17:36:20+02:00 OVS Daemon CPU Pinning - - e9e6120 2023-05-22T10:28:21+00:00 Fix localnet set as layer2 in netinfo - - e48a187 2023-05-19T12:05:12-05:00 Always use OVN's iface-id-ver option in non-DPUHost mode - - 8e8a80b 2023-05-19T11:45:35-05:00 workflows: set read-only permissions where possible - - 61541cf 2023-05-18T13:03:01-04:00 initial pods are not wired for hybrid overlay - - c2907d1 2023-05-17T10:53:24-05:00 ovn: assume Logical Datapath Groups are always supported - - d253dfa 2023-05-17T10:41:19-05:00 ovn: assume ACL logging is always supported - - 13aac28 2023-05-17T10:03:27-05:00 network-controller: assume multicast/IGMP_Group is supported by OVN - - a87ec0a 2023-05-17T17:17:11+03:00 Drop MgmtPortRepresentor config variable - - 5c6edd6 2023-05-16T11:09:47+00:00 Egress IP, Services: use all node IP addresses - - 8889f47 2023-05-15T15:15:28+01:00 Emit node events only when retry failure - - 2200972 2023-05-15T11:51:27+02:00 Expose PfID and VfID in DPU host mode and read that in DPU mode - - dea653a 2023-05-11T22:52:42+02:00 Call SyncEndpoints from AddService - - bbc8ecf 2023-05-11T20:49:57+00:00 Bump github.com/docker/distribution in /test/e2e - - eddd4fe 2023-05-11T12:58:59+02:00 Fix handling alternative netdev names - - 454119c 2023-05-11T10:29:13+02:00 e2e: Move NodePort test to Services suite - - f041b03 2023-05-11T10:29:13+02:00 Dualstack Service unit test - - 8d0252b 2023-05-11T10:29:13+02:00 Configure TemplateLB with all host addresses - - ce0d8bc 2023-05-09T14:41:58-04:00 Single interface for network information - - 1f80cb5 2023-05-09T16:29:10+03:00 Egress Service: document known non-SNATed traffic issue - - 03ea2c4 2023-05-09T12:12:51+02:00 Add unit test for getDefaultGatewayInterfaceByFamily and getDefaultGatewayInterfaceDetails - - e70b35b 2023-05-09T12:12:51+02:00 getDefaultGatewayInterfaceDetails: do not return empty gateway IPs - - 1fbcc39 2023-05-09T12:12:50+02:00 Allow a scenario where there is only IPv4 default GW specified in a dual-stack cluster - - d245054 2023-05-09T09:28:30+03:00 Add EgressService "Network" E2E - - 8378793 2023-05-09T09:28:30+03:00 Update EgressService docs - - 94228ab 2023-05-09T09:28:30+03:00 Update EgressService E2E - - 912a2d0 2023-05-09T09:28:30+03:00 Update manifests for EgressService - - e1eb338 2023-05-09T09:28:30+03:00 node-tests: Lock FakeIPTables - - ec5685b 2023-05-09T09:28:27+03:00 EgressService refactor: ovnkube-node side - - 24b820e 2023-05-09T09:26:58+03:00 EgressService refactor: ovnkube-master - - 8a349d3 2023-05-09T09:26:58+03:00 Remove old egress-service annotations - - e0886c2 2023-05-09T09:26:58+03:00 Add EgressService CRD - - 4adec1b 2023-05-08T23:34:21+02:00 Add enable-multi-networkpolicy CLI flag - - 7b88e0a 2023-05-08T15:00:25-04:00 Fix stale SNAT entries for completed pods - - e8197b4 2023-05-08T14:58:44-04:00 Add route manager - - 89a16ff 2023-05-08T10:17:52+02:00 docs, multi-net policy: provide user documentation - - 7438591 2023-05-05T09:35:47+02:00 Provide dependency check for python3-pip - - 1c64fab 2023-05-05T09:35:47+02:00 Adjust python ssl library dependency check - - 3f429e5 2023-05-04T18:10:37-04:00 Clean up the mgmt port on OvS bridge for the DPU-Host (Tenant Cluster) - - fa78a2c 2023-05-04T11:24:23-04:00 Adds code owners - - c272f8e 2023-05-04T10:42:40+02:00 multi-homing, policy, e2e: add requiresExtraNamespace attribute to pod config - - c5f760a 2023-05-03T11:54:07-04:00 Enable github actions merge group - - 5f1fbb8 2023-05-02T09:46:59+02:00 Filter out IP addresses added by keepalived - - c174dd5 2023-05-01T17:25:13-07:00 cmdDel should return if connection details annotation does not exist - - 5cf99d2 2023-04-29T11:17:04+02:00 Avoid external connectivity flakes in E2E - - 58c7719 2023-04-28T21:15:17-04:00 Fix handling of DPU on node address change/setting - - 6b7959f 2023-04-28T20:09:28-04:00 Fix minor typo in error string - - 667d85e 2023-04-28T12:02:52-04:00 Disable Secondary networks - layer2 and localnet when Interconnect feature is enabled. - - 3d4c1b0 2023-04-28T11:58:05-04:00 Add interconnect support for secondary layer3 networks. - - f7c40b0 2023-04-28T11:58:04-04:00 Add a new option to specify the zone name. - - 1d76233 2023-04-28T11:58:02-04:00 network-controller-manager: Add zone support for services. - - 93a0dc7 2023-04-28T11:58:01-04:00 network-controller-manager: Manage network policies for each zone. - - 8aa1423 2023-04-28T11:58:00-04:00 network-controller-manager: Create interconnect resources. - - ae27492 2023-04-28T11:57:58-04:00 cluster-manager: Generate Transit switch port ips. - - 2e32b52 2023-04-28T11:57:57-04:00 network-controller-manager: Manage the nodes which belong to local zone. - - 4ff3c32 2023-04-28T11:57:56-04:00 cluster-manager: Allocate node's GW router port addresses. - - 9c81678 2023-04-28T11:57:56-04:00 ovnkube-node: Set node zone name in the node annotation. - - 8227f9d 2023-04-28T11:57:54-04:00 cluster-manager: Generate a unique ID (int) for each node. - - ff4bd26 2023-04-28T11:10:40+02:00 Use new sriovnet.GetPfIndexByVfPciAddress function - - 146c4f4 2023-04-28T11:10:37+02:00 Upgrade sriovnet - - 3a9a0bb 2023-04-28T11:10:33+02:00 Regenerate mockery changes for SriovnetOps - - 4323405 2023-04-27T14:23:28-04:00 Check if the status of a pod before trying to get its ip - - 82adc2a 2023-04-18T07:30:09-06:00 Fix bug that resulted in routes not be restored to a new vnic - -- oc image-arm64 9c7b9edaea80a0d6acbe5f1b0278b7d55cc2d7d9 to a2f337a204f5afe07e0118a946ed17ac53a2bad2 - - 758b5c35 2023-06-14T19:32:06+02:00 pernodepod: percent works like this +- cluster-network-operator embedded-component 5b8884021f201dbe7784c13dbc5e6939a70d5b44 to d1e994081a11db21f2c37731545a53836d7682c7 + - 89d9ec6 2023-06-12T16:24:08-04:00 Updates unit test for controller-runtime status + - 5a4cef2 2023-06-12T10:31:21-04:00 rebase_1.27: unit tests + - 4e8eecb 2023-06-12T10:21:27-04:00 rebase_1.27: lint fixes + - 9d6ce8d 2023-06-12T10:06:58-04:00 Hacked to oblivion + - db57a47 2023-06-12T10:06:58-04:00 Rebase to kube 1.27 + +- kubernetes embedded-component 55f2dbe862f9797f524432795c67a775a63025d4 to b4518170e4f4b621ae1e97d5fd178191bf2b285d + - b1e891582 2023-06-14T14:03:11+00:00 UPSTREAM: : bump apiserver-library-go + - 4f9ce199a 2023-04-14T09:44:23-06:00 UPSTREAM: : STOR-1270: Admission plugin to deny deletion of storages.operator.openshift.io + +- oc image-amd64 c7a312c09ad02847322b3237d4222c51fcf9db4e to fcd851887c7c44255c535c2908f9a7d9cacf07c8 + - 51742e25 2023-06-16T11:53:18-04:00 cleanup naming + - 01e95002 2023-06-16T10:34:50-04:00 wait for node reboot + - e7d0d5d3 2023-06-15T16:54:18-04:00 better qualify name + - 8e30475d 2023-06-15T16:17:00-04:00 add reboot-nodes + - 7464784a 2023-06-15T14:54:07-04:00 tweak output format + - 4c591b7b 2023-06-15T14:02:34-04:00 correct the cert matching + - 45f344ab 2023-06-15T13:25:36-04:00 trustpurge: scope the observed NSes to "openshift-" prefixed ones + - 9326cbd8 2023-06-15T13:25:36-04:00 trustpurge: extend observing the trust changes to all leaf certs + - c0fca090 2023-06-15T13:25:36-04:00 trustpurge: fix docs issues + - 6628c5e7 2023-06-15T13:25:36-04:00 trustpurge: don't proceed if trustbundle changes affect trust + - 8360a2bc 2023-06-15T12:11:23-04:00 fix directories for constitency - b0a8593f 2023-06-14T11:26:23-04:00 ocpcertificates: complete MCS CA rotation command - 38aebecc 2023-06-14T11:16:27-04:00 regeneratemco: Vendor dataurl - ed0b45df 2023-06-14T11:16:25-04:00 ocpcertificates: Add regenerate-mco - - 89c64979 2023-06-14T16:55:19+02:00 ocpcertificates: don't make assumptions on resources not to bring piping from -oname commands - - 207976bb 2023-06-14T12:58:45+02:00 clusteroperator,ocpcertificates: add command descriptions and examples - - 6cdb77f6 2023-06-14T10:27:36+02:00 waitforstable: fix typo in minimum-stable-period flag - - 0885b3c9 2023-06-14T10:06:55+02:00 ocpcertificates: fix handling resources by names explicitly - - 83d4101b 2023-06-13T18:45:45-04:00 add new kubelet bootstrap command - - e64e7bd0 2023-06-13T16:32:55-04:00 add directives and fix percentage node calculation - - c41e53ec 2023-06-13T16:14:04-04:00 skip unready nodes quickly - - b97709a6 2023-06-13T16:02:40-04:00 add the option to add a command when restarting kubelets - - 9722dda5 2023-06-13T17:03:35+02:00 trustpurge: use RetryOnConflict for conflict handling - - 1b15e234 2023-06-13T10:07:53-04:00 add newline between polls to make it easier to read by hu9mans - - 6fd3c946 2023-06-13T10:04:49-04:00 update output to make the wait easier to see and print all proceeding operators - - e7ae218b 2023-06-13T16:04:23+02:00 ocpcertificates: hardcode resources to use with given commands - - c1c8a43c 2023-06-13T16:04:22+02:00 trustpurge: allow excluding ca-bundles - - dc2d78de 2023-06-13T16:04:22+02:00 trustpurge: move to Update, retry on Update() conflicts - - 008cde4b 2023-06-13T16:04:22+02:00 ocpcertificates: add the 'remove-old-trust' subcommand - - a9eea729 2023-06-13T16:04:22+02:00 certregen: return error on failed apply to stop from further progressing - - 38d9a8fa 2023-06-13T16:04:22+02:00 certregen: add unit tests for leaf cert regen - - 7f7be0ae 2023-06-13T16:04:09+02:00 certregen: only generate 2048 bit keys to speed up tests - - 4d4c49ca 2023-06-13T09:42:18-04:00 update wait for stability to handle short durations - - 91393bbd 2023-06-13T09:23:40-04:00 update for comments - - 7380acd1 2023-06-13T07:20:36-04:00 include new shell escaping dependency - - 636d40fc 2023-06-13T07:07:22-04:00 create command to create new adminkubeconfig - - 480437d8 2023-06-12T19:08:14-04:00 add a command to copy content to every node - - f7f6eee3 2023-06-12T17:58:03-04:00 refactor the restart kubelet to extract PerNodePod commands - - a9e42596 2023-06-12T09:03:05-04:00 add kubelet restart - - 9c890a84 2023-06-09T13:28:28-04:00 add command to restart kubelets - 67340f1a 2023-06-06T15:19:07+03:00 Add source per mirror source registry + - dc8de097 2023-06-06T12:32:24+08:00 [OCPNODE-1580]update oc amd release mirror output using idms - 2d8b3ee9 2023-06-05T10:39:35+03:00 Not add source if MirrorSourcePolicy is NeverContactSource - 1c0b85df 2023-06-05T10:39:35+03:00 oc image extract: add --idms-file flag and deprecate icsp - 4616eb46 2023-06-05T10:39:35+03:00 Introduce IDMS support as alternative source strategy -- ovn-kubernetes image-arm64 8f60d8256d695de33219c36fc3b83a924264eddf to 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 - - ece5840 2023-06-13T21:48:59+02:00 Use the old leadership lock name for global zone - - 52ac333 2023-06-13T21:48:32+02:00 Fix podIPs not found on IC +- ovn-kubernetes image-amd64 23c67c62ed1d912387791a1d8eb422b367c422dc to 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 - eacdaa7 2023-06-13T09:44:38+02:00 Validate port before deleting conntrack flow - d829d7d 2023-06-13T09:44:21+02:00 Use no-uplink gateway bridge in compact-mode e2e test - f764a79 2023-06-13T09:44:16+02:00 Allow external gateway bridge without uplink port In local gateway mode - - 5d2d473 2023-06-07T14:35:19+02:00 Stop using a waitgroup in route manager - - dcd5003 2023-06-06T15:24:45+02:00 Update OCPHACKs to use nodeipt pkg - - 214b3ba 2023-05-23T17:36:20+02:00 Pretty print CPUSet - - 1286207 2023-05-23T17:36:20+02:00 Add smoke tests for OVS CPU affinity pinning - - 46d2ce5 2023-05-23T17:36:20+02:00 OVS Daemon CPU Pinning - - e9e6120 2023-05-22T10:28:21+00:00 Fix localnet set as layer2 in netinfo - - e48a187 2023-05-19T12:05:12-05:00 Always use OVN's iface-id-ver option in non-DPUHost mode - - 8e8a80b 2023-05-19T11:45:35-05:00 workflows: set read-only permissions where possible - - 61541cf 2023-05-18T13:03:01-04:00 initial pods are not wired for hybrid overlay - - c2907d1 2023-05-17T10:53:24-05:00 ovn: assume Logical Datapath Groups are always supported - - d253dfa 2023-05-17T10:41:19-05:00 ovn: assume ACL logging is always supported - - 13aac28 2023-05-17T10:03:27-05:00 network-controller: assume multicast/IGMP_Group is supported by OVN - - a87ec0a 2023-05-17T17:17:11+03:00 Drop MgmtPortRepresentor config variable - - 5c6edd6 2023-05-16T11:09:47+00:00 Egress IP, Services: use all node IP addresses - - 8889f47 2023-05-15T15:15:28+01:00 Emit node events only when retry failure - - 2200972 2023-05-15T11:51:27+02:00 Expose PfID and VfID in DPU host mode and read that in DPU mode - - dea653a 2023-05-11T22:52:42+02:00 Call SyncEndpoints from AddService - - bbc8ecf 2023-05-11T20:49:57+00:00 Bump github.com/docker/distribution in /test/e2e - - eddd4fe 2023-05-11T12:58:59+02:00 Fix handling alternative netdev names - - 454119c 2023-05-11T10:29:13+02:00 e2e: Move NodePort test to Services suite - - f041b03 2023-05-11T10:29:13+02:00 Dualstack Service unit test - - 8d0252b 2023-05-11T10:29:13+02:00 Configure TemplateLB with all host addresses - - ce0d8bc 2023-05-09T14:41:58-04:00 Single interface for network information - - 1f80cb5 2023-05-09T16:29:10+03:00 Egress Service: document known non-SNATed traffic issue - - 03ea2c4 2023-05-09T12:12:51+02:00 Add unit test for getDefaultGatewayInterfaceByFamily and getDefaultGatewayInterfaceDetails - - e70b35b 2023-05-09T12:12:51+02:00 getDefaultGatewayInterfaceDetails: do not return empty gateway IPs - - 1fbcc39 2023-05-09T12:12:50+02:00 Allow a scenario where there is only IPv4 default GW specified in a dual-stack cluster - - d245054 2023-05-09T09:28:30+03:00 Add EgressService "Network" E2E - - 8378793 2023-05-09T09:28:30+03:00 Update EgressService docs - - 94228ab 2023-05-09T09:28:30+03:00 Update EgressService E2E - - 912a2d0 2023-05-09T09:28:30+03:00 Update manifests for EgressService - - e1eb338 2023-05-09T09:28:30+03:00 node-tests: Lock FakeIPTables - - ec5685b 2023-05-09T09:28:27+03:00 EgressService refactor: ovnkube-node side - - 24b820e 2023-05-09T09:26:58+03:00 EgressService refactor: ovnkube-master - - 8a349d3 2023-05-09T09:26:58+03:00 Remove old egress-service annotations - - e0886c2 2023-05-09T09:26:58+03:00 Add EgressService CRD - - 4adec1b 2023-05-08T23:34:21+02:00 Add enable-multi-networkpolicy CLI flag - - 7b88e0a 2023-05-08T15:00:25-04:00 Fix stale SNAT entries for completed pods - - e8197b4 2023-05-08T14:58:44-04:00 Add route manager - - 89a16ff 2023-05-08T10:17:52+02:00 docs, multi-net policy: provide user documentation - - 7438591 2023-05-05T09:35:47+02:00 Provide dependency check for python3-pip - - 1c64fab 2023-05-05T09:35:47+02:00 Adjust python ssl library dependency check - - 3f429e5 2023-05-04T18:10:37-04:00 Clean up the mgmt port on OvS bridge for the DPU-Host (Tenant Cluster) - - fa78a2c 2023-05-04T11:24:23-04:00 Adds code owners - - c272f8e 2023-05-04T10:42:40+02:00 multi-homing, policy, e2e: add requiresExtraNamespace attribute to pod config - - c5f760a 2023-05-03T11:54:07-04:00 Enable github actions merge group - - 5f1fbb8 2023-05-02T09:46:59+02:00 Filter out IP addresses added by keepalived - - c174dd5 2023-05-01T17:25:13-07:00 cmdDel should return if connection details annotation does not exist - - 5cf99d2 2023-04-29T11:17:04+02:00 Avoid external connectivity flakes in E2E - - 58c7719 2023-04-28T21:15:17-04:00 Fix handling of DPU on node address change/setting - - 6b7959f 2023-04-28T20:09:28-04:00 Fix minor typo in error string - - 667d85e 2023-04-28T12:02:52-04:00 Disable Secondary networks - layer2 and localnet when Interconnect feature is enabled. - - 3d4c1b0 2023-04-28T11:58:05-04:00 Add interconnect support for secondary layer3 networks. - - f7c40b0 2023-04-28T11:58:04-04:00 Add a new option to specify the zone name. - - 1d76233 2023-04-28T11:58:02-04:00 network-controller-manager: Add zone support for services. - - 93a0dc7 2023-04-28T11:58:01-04:00 network-controller-manager: Manage network policies for each zone. - - 8aa1423 2023-04-28T11:58:00-04:00 network-controller-manager: Create interconnect resources. - - ae27492 2023-04-28T11:57:58-04:00 cluster-manager: Generate Transit switch port ips. - - 2e32b52 2023-04-28T11:57:57-04:00 network-controller-manager: Manage the nodes which belong to local zone. - - 4ff3c32 2023-04-28T11:57:56-04:00 cluster-manager: Allocate node's GW router port addresses. - - 9c81678 2023-04-28T11:57:56-04:00 ovnkube-node: Set node zone name in the node annotation. - - 8227f9d 2023-04-28T11:57:54-04:00 cluster-manager: Generate a unique ID (int) for each node. - - ff4bd26 2023-04-28T11:10:40+02:00 Use new sriovnet.GetPfIndexByVfPciAddress function - - 146c4f4 2023-04-28T11:10:37+02:00 Upgrade sriovnet - - 3a9a0bb 2023-04-28T11:10:33+02:00 Regenerate mockery changes for SriovnetOps - - 4323405 2023-04-27T14:23:28-04:00 Check if the status of a pod before trying to get its ip - - 82adc2a 2023-04-18T07:30:09-06:00 Fix bug that resulted in routes not be restored to a new vnic -- kubernetes image-arm64 55f2dbe862f9797f524432795c67a775a63025d4 to 27b445f51acd71c57d8d57a86e504976dcef6271 +- kubernetes image-amd64 55f2dbe862f9797f524432795c67a775a63025d4 to b4518170e4f4b621ae1e97d5fd178191bf2b285d - b1e891582 2023-06-14T14:03:11+00:00 UPSTREAM: : bump apiserver-library-go + - 4f9ce199a 2023-04-14T09:44:23-06:00 UPSTREAM: : STOR-1270: Admission plugin to deny deletion of storages.operator.openshift.io + +- oc image-arm64 a2f337a204f5afe07e0118a946ed17ac53a2bad2 to fcd851887c7c44255c535c2908f9a7d9cacf07c8 + - 51742e25 2023-06-16T11:53:18-04:00 cleanup naming + - 01e95002 2023-06-16T10:34:50-04:00 wait for node reboot + - e7d0d5d3 2023-06-15T16:54:18-04:00 better qualify name + - 8e30475d 2023-06-15T16:17:00-04:00 add reboot-nodes + - 7464784a 2023-06-15T14:54:07-04:00 tweak output format + - 4c591b7b 2023-06-15T14:02:34-04:00 correct the cert matching + - 45f344ab 2023-06-15T13:25:36-04:00 trustpurge: scope the observed NSes to "openshift-" prefixed ones + - 9326cbd8 2023-06-15T13:25:36-04:00 trustpurge: extend observing the trust changes to all leaf certs + - c0fca090 2023-06-15T13:25:36-04:00 trustpurge: fix docs issues + - 6628c5e7 2023-06-15T13:25:36-04:00 trustpurge: don't proceed if trustbundle changes affect trust + - 8360a2bc 2023-06-15T12:11:23-04:00 fix directories for constitency + - dc8de097 2023-06-06T12:32:24+08:00 [OCPNODE-1580]update oc amd release mirror output using idms + +- kubernetes image-arm64 27b445f51acd71c57d8d57a86e504976dcef6271 to b4518170e4f4b621ae1e97d5fd178191bf2b285d + - 4f9ce199a 2023-04-14T09:44:23-06:00 UPSTREAM: : STOR-1270: Admission plugin to deny deletion of storages.operator.openshift.io diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index eb5640dae1..442a7371ed 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -3,26 +3,26 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 0e500e6 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a1de1b1cc85ce2d41e918d14534e5187b981819b https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1e15498f434994aa6676c146638b886e08c93aa5 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f42458c923d20576d88decb5495888c410ac6051 -https://github.com/openshift/cluster-network-operator embedded-component 5b8884021f201dbe7784c13dbc5e6939a70d5b44 +https://github.com/openshift/cluster-network-operator embedded-component d1e994081a11db21f2c37731545a53836d7682c7 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 005db16dd2e3847c0dc76d1a91314c51a55f99b4 https://github.com/openshift/cluster-policy-controller embedded-component cc787e1b1e177696817b66689a03471914083a67 https://github.com/openshift/etcd embedded-component 53cdd6b0519f0e57da9032b473465799bba4b1a0 -https://github.com/openshift/kubernetes embedded-component 55f2dbe862f9797f524432795c67a775a63025d4 +https://github.com/openshift/kubernetes embedded-component b4518170e4f4b621ae1e97d5fd178191bf2b285d https://github.com/openshift/machine-config-operator embedded-component 3d84f653e08d760d446442ddc80c3da21d8d7e59 https://github.com/openshift/openshift-controller-manager embedded-component 41104bfd3c2a492e4e20516fd7065b9c86e2ad7e https://github.com/openshift/route-controller-manager embedded-component 38d9ec83ce464e9198af05918ab03a7995a11866 https://github.com/openshift/service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-amd64 c7a312c09ad02847322b3237d4222c51fcf9db4e +https://github.com/openshift/oc image-amd64 fcd851887c7c44255c535c2908f9a7d9cacf07c8 https://github.com/openshift/coredns image-amd64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-amd64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-amd64 27c255551673ba529ac6c9419abe13451afa3e4d -https://github.com/openshift/ovn-kubernetes image-amd64 23c67c62ed1d912387791a1d8eb422b367c422dc -https://github.com/openshift/kubernetes image-amd64 55f2dbe862f9797f524432795c67a775a63025d4 +https://github.com/openshift/ovn-kubernetes image-amd64 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 +https://github.com/openshift/kubernetes image-amd64 b4518170e4f4b621ae1e97d5fd178191bf2b285d https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-arm64 a2f337a204f5afe07e0118a946ed17ac53a2bad2 +https://github.com/openshift/oc image-arm64 fcd851887c7c44255c535c2908f9a7d9cacf07c8 https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-arm64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-arm64 27c255551673ba529ac6c9419abe13451afa3e4d https://github.com/openshift/ovn-kubernetes image-arm64 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 -https://github.com/openshift/kubernetes image-arm64 27b445f51acd71c57d8d57a86e504976dcef6271 +https://github.com/openshift/kubernetes image-arm64 b4518170e4f4b621ae1e97d5fd178191bf2b285d https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae From 6a16a7fc2360a71f5dc7dba94a4dc341c3c14f1a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:10:49 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 62 ++++++++++++++++----------------- go.sum | 106 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/go.mod b/go.mod index 330f9e4068..3dcaae2d42 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( github.com/opencontainers/runc v1.1.6 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect github.com/opencontainers/selinux v1.10.0 // indirect - github.com/openshift/apiserver-library-go v0.0.0-20230503174907-d9b2bf6185e9 // indirect + github.com/openshift/apiserver-library-go v0.0.0-20230614113750-03175bf32c26 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/profile v1.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -228,34 +228,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230607120515-55f2dbe862f9 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 // from kubernetes ) diff --git a/go.sum b/go.sum index 4f1ad9dc6b..bee124fb33 100644 --- a/go.sum +++ b/go.sum @@ -593,8 +593,8 @@ github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuh github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k= github.com/openshift/api v0.0.0-20230516201849-333bc194ef7a h1:tz6xYik+q1q6o/AXoRZeGkk2idio130xeh2R1ZBNqGM= github.com/openshift/api v0.0.0-20230516201849-333bc194ef7a/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k= -github.com/openshift/apiserver-library-go v0.0.0-20230503174907-d9b2bf6185e9 h1:7SNTyJ2LGSrPzybeL7z08e5bSY921Cm0R6/cjtZEYJw= -github.com/openshift/apiserver-library-go v0.0.0-20230503174907-d9b2bf6185e9/go.mod h1:pyUSwoDce710NhzXOmooyt5DBJjUEb2fifFSdKCcMyA= +github.com/openshift/apiserver-library-go v0.0.0-20230614113750-03175bf32c26 h1:595Ke1bfoLAsEMUr+Ej7rhcvM+66VOt/pooTIPSj5Qw= +github.com/openshift/apiserver-library-go v0.0.0-20230614113750-03175bf32c26/go.mod h1:pyUSwoDce710NhzXOmooyt5DBJjUEb2fifFSdKCcMyA= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533 h1:mh3ZYs7kPIIe3UUY6tJcTExmtjnXXUu0MrBuK2W/Qvw= github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= @@ -602,57 +602,57 @@ github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrk github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17 h1:O64VIXF1g9CdA+dIibNVk/aFo4TdLrzjGVT5EYN8sDw= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g= -github.com/openshift/kubernetes v0.0.0-20230607120515-55f2dbe862f9 h1:L1XIXclTxolkslpTblcblkT+3g+6yjlft736B9qPO/Y= -github.com/openshift/kubernetes v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:wqnNgOZkxZc5FGVvgPtMyjxLfYKHpwQvKRvHb0zZAa4= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 h1:PDPdDefgzkPodDrJdKFOMKyN0/BzNL/IZ7jpoYwRClI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 h1:P1IK5rnhv3WihIgrUm5hFGpx11PT/ieBDd3cYUoROho= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:hpAC4eOVaEZZk9tLZ38gAlHF2qwgFI+xcFX+pCjYjJ0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 h1:BiWZpb/UpysHLNgtwGPlZyCj6IwlOVAkqAp41DAXpJo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 h1:tOCUiUrpHQZr/LPttiD9O01qH9bVc2ceCbpCJuzhsyE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:JC4dA6xOdRtPv8CB8ycP1zRRmgAWtyXWLhjwXKDLt1Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 h1:KHJOkuAllm7+fCQ1bNh71xPjc3OvTv/SSQ2gOuCYNao= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 h1:eIxpgzlLOScG6R5zFjcrg7q7o/3Slc3lQxpsNEc7ueE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 h1:WvxhFxq65bpRzgQpuoRrbSpfQCIY5SXwEeejA9ELlys= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 h1:iZF2lpWyALWt8O6rjBUrG3tXEGLKjukNErisLFLWl8A= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 h1:Pqi03ihzbK27LKc1Z89izzyHLtDjq5lgpZO2MH/KjdY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 h1:WnqlP5edFQUHYPekDmaeOg//RXQ/eOrEly2BrBK9YOU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:h+VG9kJL2rXABC0yOx5gki+dGMYbadntmeyMviy0sqg= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 h1:5sIFCL84enynhQTxkL1ZyGF3vbiBJia/jlHNgm+qznw= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9 h1:iamL+Y5TBUohNQtWL1fiODfa3cYJWeIU0MO2K+5rFWo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9 h1:olkqG9CLVcS5PqEgUas1sTTOVJft2+bi36LeqstX9i8= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9 h1:v/vdgxWsAT4VB1Kr4mXiF1LQE9Vf/b4NDHNPgRA7Ii0= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 h1:mJFwpRiCtRXYCfxJLqrRPdo5XBQ8N/ZN2TxRYJMVAVM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:koRYt7cYiktjZ8iwukGCc5dUVGyOcavTgKH7Kef/70g= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 h1:RvSTBqgpRBakh4o8B1klH2nwOB84hN1hxuwFEeEv3Ok= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:W4G6TQNY6iPvvZM8IEzh9RjNQAARyqvnjXUC/xT3xgE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 h1:JvMTnjevvf29iRhTMT9Ut5K+Yb2v2rmZfEJJzzN4k0Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9 h1:4aVfE63Ztz653spClbf6hoLUNtmxwHSwTfwO4h12KMg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 h1:28gsGJrOS2C8r0LIaVX72AkKV5c9B/oZcUZUircV9Yk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 h1:4vKAZ8nRUiI0puN6YBoyTstmZbHarAPtxRmMw4XZQA0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9 h1:FIJFIxp1et5gZoJvsfUmQvdgMwoOEbk3NqVrRIpAwbI= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9 h1:DTGeZO8Nx6mjRsNMvIxSVnI6Deo+WpAt/NuNM9CMMuo= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 h1:cqi5ErwNDCs9AfJrhZLogkUqFsYVi3PQfa+IY5bTfQ8= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 h1:XoB8mRViV09Bz7Q2niK3FG5Y5l7+gdL8RCy0wO0y8oU= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= +github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 h1:93DgOR6dWIMWilea6+vq67nm8OYhD/JlDbJu0C6IkFI= +github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4/go.mod h1:dOsYs3YMdOMu4ncJsxyvoD4eHq5/B6YkHFp1ZY4plek= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 h1:Mbmc+B3MqOB98fFclQACrDl283BzqM/BuJoVYx6zqgw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 h1:3Otd2hUwAiJyegpewbh5Y5lDqbv31708zI4stWIhfDA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4/go.mod h1:hpAC4eOVaEZZk9tLZ38gAlHF2qwgFI+xcFX+pCjYjJ0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 h1:FRVuBL87BPxxhAQ7Y+THInj+LonLVEFk6fV/+mJZbNA= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 h1:J37hC8NtyyLovczI9ugjzZoDjTG1GXUDdgFYgXr/ol8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4/go.mod h1:JC4dA6xOdRtPv8CB8ycP1zRRmgAWtyXWLhjwXKDLt1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 h1:iTB9Rd49g58St/mCSnTh5AsaPTV6Ht3SsFDGutkalG8= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 h1:/eQhC8qk2qWi0LpNlkaTGhgamNmbnG3ONht+Jqvz9Cg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 h1:zSXUegXI/i0zyVxufhyWi+//SMZHstGSG6FKVCcya0Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 h1:3x5tzR2AyV4Qzllonil/H/KttEM3ieHgp7Oc9/2FIDg= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 h1:aH2ZCI+cduRdKbciKXen+5N1XYIEWceidlFeTM5Zdvg= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 h1:VTPmpYtb4Cg+4yHccT2LPcV9xldIJnQoVeJwc4kVekM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4/go.mod h1:h+VG9kJL2rXABC0yOx5gki+dGMYbadntmeyMviy0sqg= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 h1:5PbD/iDscgRM+8y/RFfmreaOda9PgST4MroTZqPbSuQ= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 h1:ypfO2hXnyvDKx8RFzmHEePlNg644SuFIlfoe2fS+xg4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 h1:iBvaeQ89jA4L9SgCntjo9J6OdW3kYVAvIS/nqtnU1Fc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 h1:pf9oftL+whujf8AHzKm+UHLRCT+pzSLbtpM0mi1STw4= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 h1:D8Hr61dOxVC3TPPo4gSVc6gWoL/m2f9d5MDrbN4tKo0= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4/go.mod h1:koRYt7cYiktjZ8iwukGCc5dUVGyOcavTgKH7Kef/70g= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 h1:N4vCnRy7Kfal866HT0tIWHNwNPy/Tjp5lZJFWUnN55Y= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4/go.mod h1:W4G6TQNY6iPvvZM8IEzh9RjNQAARyqvnjXUC/xT3xgE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 h1:3zV14petE7TvwAZnKeBbuDuwnlAxQSEzkhYZUgGIdMM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 h1:lPESsxqhgSugmml1xOGuSEC9X7IMwLuEi094qObEKJM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 h1:E63oUVQ4HG2wHvVd80PPYwILHol7buUGbslS3GCW8mc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 h1:gnwuy+fTvctl24SnIN8Wr+HzHYDZ9i6XXu6FZVmUjcE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 h1:EWLMNuPUHht2Y0SiZaGCen6QkZxGzL8g4xQrJyjrBjk= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 h1:Axj7HLkk5/Gb3IY2TLotuwsGgEVEReY2+QFoqVzSp/0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 h1:TLff9nMM025eTXihDyg6NzHvcImHQf2ZxwvacGPYEjY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 h1:iqLHjEaWTjz7dgWRqlzDX0PYTqFmdRse2C5ycmQyRAE= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb h1:B1VhZf/XTcInahu7XmosGLDGlKgJHj9eYtNBq+tA2dY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= From c92252cdbf5d49f277cdc7d1d6001fa3fd9154ba Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:04 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../sccadmission/admission.go | 43 ++++++- .../sccmatching/matcher.go | 14 +-- .../sccmatching/provider.go | 16 +-- .../cr_validation_registration.go | 3 + .../deny_delete_cluster_operator_resource.go | 52 ++++++++ vendor/modules.txt | 113 +++++++++--------- 6 files changed, 160 insertions(+), 81 deletions(-) create mode 100644 vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator/deny_delete_cluster_operator_resource.go diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go index f29ce7b55b..ab540fefc2 100644 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go +++ b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go @@ -90,8 +90,9 @@ func (c *constraint) Admit(ctx context.Context, a admission.Attributes, _ admiss // TODO(liggitt): allow spec mutation during initializing updates? specMutationAllowed := a.GetOperation() == admission.Create + ephemeralContainersMutationAllowed := specMutationAllowed || (a.GetOperation() == admission.Update && a.GetSubresource() == "ephemeralcontainers") - allowedPod, sccName, validationErrs, err := c.computeSecurityContext(ctx, a, pod, specMutationAllowed, "") + allowedPod, sccName, validationErrs, err := c.computeSecurityContext(ctx, a, pod, specMutationAllowed, ephemeralContainersMutationAllowed, "") if err != nil { return admission.NewForbidden(a, err) } @@ -121,7 +122,7 @@ func (c *constraint) Validate(ctx context.Context, a admission.Attributes, _ adm pod := a.GetObject().(*coreapi.Pod) // compute the context. Mutation is not allowed. ValidatedSCCAnnotation is used as a hint to gain same speed-up. - allowedPod, _, validationErrs, err := c.computeSecurityContext(ctx, a, pod, false, pod.ObjectMeta.Annotations[securityv1.ValidatedSCCAnnotation]) + allowedPod, _, validationErrs, err := c.computeSecurityContext(ctx, a, pod, false, false, pod.ObjectMeta.Annotations[securityv1.ValidatedSCCAnnotation]) if err != nil { return admission.NewForbidden(a, err) } @@ -177,7 +178,13 @@ func (c *constraint) areListersSynced() bool { return true } -func (c *constraint) computeSecurityContext(ctx context.Context, a admission.Attributes, pod *coreapi.Pod, specMutationAllowed bool, validatedSCCHint string) (*coreapi.Pod, string, field.ErrorList, error) { +func (c *constraint) computeSecurityContext( + ctx context.Context, + a admission.Attributes, + pod *coreapi.Pod, + specMutationAllowed, ephemeralContainersMutationAllowed bool, + validatedSCCHint string, +) (*coreapi.Pod, string, field.ErrorList, error) { // get all constraints that are usable by the user klog.V(4).Infof("getting security context constraints for pod %s (generate: %s) in namespace %s with user info %v", pod.Name, pod.GenerateName, a.GetNamespace(), a.GetUserInfo()) @@ -224,6 +231,8 @@ func (c *constraint) computeSecurityContext(ctx context.Context, a admission.Att // If mutation is not allowed and validatedSCCHint is provided, check the validated policy first. // Keep the order the same for everything else sort.SliceStable(constraints, func(i, j int) bool { + // disregard the ephemeral containers here, the rest of the pod should still + // not get mutated and so we are primarily interested in the SCC that matched previously if !specMutationAllowed { if constraints[i].Name == validatedSCCHint { return true @@ -321,6 +330,18 @@ loop: allowingProvider = provider klog.V(5).Infof("pod %s (generate: %s) validated against provider %s with mutation", pod.Name, pod.GenerateName, provider.GetSCCName()) break loop + case ephemeralContainersMutationAllowed: + podCopyCopy := podCopy.DeepCopy() + // check if, possibly, only the ephemeral containers were mutated + podCopyCopy.Spec.EphemeralContainers = pod.Spec.EphemeralContainers + if apiequality.Semantic.DeepEqual(pod, podCopyCopy) { + allowedPod = podCopy + allowingProvider = provider + klog.V(5).Infof("pod %s (generate: %s) validated against provider %s with ephemeralContainers mutation", pod.Name, pod.GenerateName, provider.GetSCCName()) + break loop + } + klog.V(5).Infof("pod %s (generate: %s) validated against provider %s, but required pod mutation outside ephemeralContainers, skipping", pod.Name, pod.GenerateName, provider.GetSCCName()) + failures[provider.GetSCCName()] = "failures final validation after mutating admission" case apiequality.Semantic.DeepEqual(pod, podCopy): // if we don't allow mutation, only use the validated pod if it didn't require any spec changes allowedPod = podCopy @@ -329,7 +350,7 @@ loop: break loop default: klog.V(5).Infof("pod %s (generate: %s) validated against provider %s, but required mutation, skipping", pod.Name, pod.GenerateName, provider.GetSCCName()) - failures[provider.GetSCCName()] = fmt.Sprintf("failures final validation after mutating admission") + failures[provider.GetSCCName()] = "failures final validation after mutating admission" } } @@ -417,11 +438,23 @@ loop: return allowedPod, allowingProvider.GetSCCName(), validationErrs, nil } +var ignoredSubresources = sets.NewString( + "exec", + "attach", + "binding", + "eviction", + "log", + "portforward", + "proxy", + "status", +) + func shouldIgnore(a admission.Attributes) (bool, error) { if a.GetResource().GroupResource() != coreapi.Resource("pods") { return true, nil } - if len(a.GetSubresource()) != 0 { + + if subresource := a.GetSubresource(); len(subresource) != 0 && ignoredSubresources.Has(subresource) { return true, nil } diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go index 11bd6e5867..09a084483d 100644 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go +++ b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go @@ -16,6 +16,7 @@ import ( corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/klog/v2" kapi "k8s.io/kubernetes/pkg/apis/core" + podhelpers "k8s.io/kubernetes/pkg/apis/core/pods" "github.com/openshift/api/security" securityv1 "github.com/openshift/api/security/v1" @@ -122,15 +123,10 @@ func AssignSecurityContext(provider SecurityContextConstraintsProvider, pod *kap pod.Annotations = generatedAnnotations errs = append(errs, provider.ValidatePodSecurityContext(pod, fldPath.Child("spec", "securityContext"))...) - for i := range pod.Spec.InitContainers { - errs = append(errs, assignContainerSecurityContext(provider, pod, &pod.Spec.InitContainers[i], field.NewPath("spec", "initContainers").Index(i).Child("securityContext"))...) - } - for i := range pod.Spec.EphemeralContainers { - errs = append(errs, assignContainerSecurityContext(provider, pod, (*kapi.Container)(&pod.Spec.EphemeralContainers[i].EphemeralContainerCommon), field.NewPath("spec", "ephemeralContainers").Index(i).Child("securityContext"))...) - } - for i := range pod.Spec.Containers { - errs = append(errs, assignContainerSecurityContext(provider, pod, &pod.Spec.Containers[i], field.NewPath("spec", "containers").Index(i).Child("securityContext"))...) - } + podhelpers.VisitContainersWithPath(&pod.Spec, fldPath, func(container *kapi.Container, path *field.Path) bool { + errs = append(errs, assignContainerSecurityContext(provider, pod, container, path)...) + return true + }) if len(errs) > 0 { return errs diff --git a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go index d136feece5..8a13bce38c 100644 --- a/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go +++ b/vendor/github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go @@ -18,6 +18,7 @@ import ( "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl" "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/user" sccutil "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/util" + podhelpers "k8s.io/kubernetes/pkg/apis/core/pods" ) // used to pass in the field being validated for reusable group strategies so they @@ -347,17 +348,10 @@ func (s *simpleProvider) ValidateContainerSecurityContext(pod *api.Pod, containe } if !s.scc.AllowHostPorts { - containersPath := fldPath.Child("containers") - for idx, c := range pod.Spec.Containers { - idxPath := containersPath.Index(idx) - allErrs = append(allErrs, s.hasHostPort(&c, idxPath)...) - } - - containersPath = fldPath.Child("initContainers") - for idx, c := range pod.Spec.InitContainers { - idxPath := containersPath.Index(idx) - allErrs = append(allErrs, s.hasHostPort(&c, idxPath)...) - } + podhelpers.VisitContainersWithPath(&pod.Spec, fldPath, func(container *api.Container, path *field.Path) bool { + allErrs = append(allErrs, s.hasHostPort(container, path)...) + return true + }) } if !s.scc.AllowHostPID && podSC.HostPID() { diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration/cr_validation_registration.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration/cr_validation_registration.go index cc1de149b3..1af9c4e71d 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration/cr_validation_registration.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration/cr_validation_registration.go @@ -19,6 +19,7 @@ import ( "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/network" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/oauth" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/project" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/rolebindingrestriction" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/route" @@ -40,6 +41,7 @@ var AllCustomResourceValidators = []string{ oauth.PluginName, project.PluginName, config.PluginName, + operator.PluginName, scheduler.PluginName, clusterresourcequota.PluginName, securitycontextconstraints.PluginName, @@ -70,6 +72,7 @@ func RegisterCustomResourceValidation(plugins *admission.Plugins) { oauth.Register(plugins) project.Register(plugins) config.Register(plugins) + operator.Register(plugins) scheduler.Register(plugins) kubecontrollermanager.Register(plugins) diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator/deny_delete_cluster_operator_resource.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator/deny_delete_cluster_operator_resource.go new file mode 100644 index 0000000000..f4cb78543c --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator/deny_delete_cluster_operator_resource.go @@ -0,0 +1,52 @@ +package operator + +import ( + "context" + "fmt" + "io" + + "k8s.io/apiserver/pkg/admission" +) + +const PluginName = "operator.openshift.io/DenyDeleteClusterOperators" + +// Register registers an admission plugin factory whose plugin prevents the deletion of cluster operator resources. +func Register(plugins *admission.Plugins) { + plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { + return newAdmissionPlugin(), nil + }) +} + +var _ admission.ValidationInterface = &admissionPlugin{} + +type admissionPlugin struct { + *admission.Handler +} + +func newAdmissionPlugin() *admissionPlugin { + return &admissionPlugin{Handler: admission.NewHandler(admission.Delete)} +} + +// Validate returns an error if there is an attempt to delete a cluster operator resource. +func (p *admissionPlugin) Validate(ctx context.Context, attributes admission.Attributes, _ admission.ObjectInterfaces) error { + if len(attributes.GetSubresource()) > 0 { + return nil + } + if attributes.GetResource().Group != "operator.openshift.io" { + return nil + } + switch attributes.GetResource().Resource { + // Deletion is denied for storages.operator.openshift.io objects named cluster, + // because MCO and KCM-O depend on this resource being present in order to + // correctly set environment variables on kubelet and kube-controller-manager. + case "storages": + if attributes.GetName() != "cluster" { + return nil + } + // Deletion is allowed for all other operator.openshift.io objects unless + // explicitly listed above. + default: + return nil + } + return admission.NewForbidden(attributes, fmt.Errorf("deleting required %s.%s resource, named %s, is not allowed", attributes.GetResource().Resource, attributes.GetResource().Group, attributes.GetName())) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a97354a899..8598d72843 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -574,7 +574,7 @@ github.com/openshift/api/template github.com/openshift/api/template/v1 github.com/openshift/api/user github.com/openshift/api/user/v1 -# github.com/openshift/apiserver-library-go v0.0.0-20230503174907-d9b2bf6185e9 +# github.com/openshift/apiserver-library-go v0.0.0-20230614113750-03175bf32c26 ## explicit; go 1.20 github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy/apis/imagepolicy/v1 @@ -1309,7 +1309,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1366,7 +1366,7 @@ 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/apiextensions-apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1410,7 +1410,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1475,7 +1475,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1633,12 +1633,12 @@ 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1975,7 +1975,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1997,14 +1997,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2038,7 +2038,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/component-helpers v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2051,7 +2051,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/controller-manager v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2068,16 +2068,16 @@ 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-20230607120515-55f2dbe862f9 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 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-20230607120515-55f2dbe862f9 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 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-20230607120515-55f2dbe862f9 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2096,13 +2096,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kms v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kube-aggregator v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2133,7 +2133,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -2166,13 +2166,13 @@ 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-20230607120515-55f2dbe862f9 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2207,7 +2207,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2224,7 +2224,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.27.1 => github.com/openshift/kubernetes v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kubernetes v1.27.1 => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2268,6 +2268,7 @@ k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/ku k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/network k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/oauth +k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/operator k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/project k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/rolebindingrestriction k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/rolebindingrestriction/validation @@ -3028,7 +3029,7 @@ 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-20230607120515-55f2dbe862f9 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3070,7 +3071,7 @@ 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-20230607120515-55f2dbe862f9 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3085,10 +3086,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3231,33 +3232,33 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 From 37c4debf4d2a236c34ee793d393ada62d25496d7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:04 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 58 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 24 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index b7dae9b11c..ee8b39d14b 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -143,33 +143,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230607120515-55f2dbe862f9 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index c73e58bf9d..3ad13b9b57 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -371,18 +371,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:rUkH7z github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:zgNwZ2ZOKkB1bhQFe3tvUqCpMbjqmp4U7kY7oXmuS7c= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 h1:PDPdDefgzkPodDrJdKFOMKyN0/BzNL/IZ7jpoYwRClI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 h1:BiWZpb/UpysHLNgtwGPlZyCj6IwlOVAkqAp41DAXpJo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 h1:KHJOkuAllm7+fCQ1bNh71xPjc3OvTv/SSQ2gOuCYNao= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 h1:eIxpgzlLOScG6R5zFjcrg7q7o/3Slc3lQxpsNEc7ueE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 h1:Pqi03ihzbK27LKc1Z89izzyHLtDjq5lgpZO2MH/KjdY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 h1:28gsGJrOS2C8r0LIaVX72AkKV5c9B/oZcUZUircV9Yk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 h1:Mbmc+B3MqOB98fFclQACrDl283BzqM/BuJoVYx6zqgw= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 h1:FRVuBL87BPxxhAQ7Y+THInj+LonLVEFk6fV/+mJZbNA= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 h1:iTB9Rd49g58St/mCSnTh5AsaPTV6Ht3SsFDGutkalG8= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 h1:/eQhC8qk2qWi0LpNlkaTGhgamNmbnG3ONht+Jqvz9Cg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 h1:aH2ZCI+cduRdKbciKXen+5N1XYIEWceidlFeTM5Zdvg= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 h1:E63oUVQ4HG2wHvVd80PPYwILHol7buUGbslS3GCW8mc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= From ee601fcd836019fd4b0f3f25187eae73097aec8f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:08 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 33ffb580f7..af14d5edc0 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -583,7 +583,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -640,7 +640,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -691,12 +691,12 @@ 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -842,7 +842,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -879,7 +879,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1006,32 +1006,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230607120515-55f2dbe862f9 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230607120515-55f2dbe862f9 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 From 937adbf8a5086fc403c985960374d2512721f6b2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:09 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 4dc6c7a0b6..d718ec323b 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:2ec15a3e6118978cbf33f9544775b2f422c1858e01d41d35e0b9ed8e790df237" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:243113aa6ec017e2577e77a51bc3ac7206b24f0bae0f5faf527df4d17cfc4174" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index 6ab4df1e5c..df62d11f87 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a64142f2ced1c51154ee51a6703f21fd0b3e70714d4cbe4c51b7bc7a8ad70835" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f6aa9bada29cee650e9f958f1aaf41ea9b91bdb24f91936ab7ceb306b65eb5" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 73c20eea43a70f02c37ab1f43728dde6e831e9fa Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:09 +0000 Subject: [PATCH 8/9] update manifests --- assets/release/release-aarch64.json | 6 +++--- assets/release/release-x86_64.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6becde2f2c..ed05b238b0 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-06-16-015443" + "base": "4.14.0-0.nightly-arm64-2023-06-18-233314" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca7c0e7727ae4687879baaa5e9491c09465db3fc4679098631a66b375a36f9b4", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ddc4ee433fa1d4433a3490cdcbf43f644d9133f17b41d9a539e8259e2adf1b", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5551810825d86b7f91e151f8862a16505b80c532dfe40ff6a572839438070e49", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33445094091e09a0ab5dfabe8824e59988656c5adfbdd08e644f55cc4425c7c1", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c41f565cdb623a16cf243c485558a446c770974198bc2d3c8154e8108d787c49", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09acb11bafe23dc67d7a1f08e250a8fc9ab711263d69334992359b5ccc6708a6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a64142f2ced1c51154ee51a6703f21fd0b3e70714d4cbe4c51b7bc7a8ad70835", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f6aa9bada29cee650e9f958f1aaf41ea9b91bdb24f91936ab7ceb306b65eb5", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97121a166a4d7cb65a45d793c026a9e22f6db6ee1df4c5c0e6f9761a2e10d299", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index ae077fb215..0331b683e8 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.14.0-0.nightly-2023-06-15-064008" + "base": "4.14.0-0.nightly-2023-06-18-111801" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d02ff47097f0a1e1a5b2612c3ea763479d367e30a5a5d31cee2f75ffec691d3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e86ea017e5de0e1e0066ccccbe280587c6aa5d0958f5803a9524a21db19de5fa", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db807ead1b7a4b2f591accd082d0329817803f59c657a5b491c9ce64e15cf27d", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8c228c6089e0e49b0c8ef680cf148d8f655fa9f0595b087ce88873cd6785d08", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d4a58a54e9b3f082269808d73a5546fb9197ee3692d350330dd49d5dd98de81", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fb22bf94fe8be7a6044107dc7708a6962b913d6189af6e1f10a236018661147", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ec15a3e6118978cbf33f9544775b2f422c1858e01d41d35e0b9ed8e790df237", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23a08b43faa584e3bbd0d5b235f12f1b2b4e17b357d45c6e518b9e8e85ce5729", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:243113aa6ec017e2577e77a51bc3ac7206b24f0bae0f5faf527df4d17cfc4174", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af13f22ebe9c0560a3c68d91971ad9f5be96fcda968a42d86d9562420ee8ed3c", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", From 63f3c2ab8bb71e24763fd9c7381d3e93bfea4ee6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 19 Jun 2023 05:11:10 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index efb5d1e5ed..052c496418 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=27 KUBE_GIT_VERSION=v1.27.1 -KUBE_GIT_COMMIT=55f2dbe862f9797f524432795c67a775a63025d4 +KUBE_GIT_COMMIT=b4518170e4f4b621ae1e97d5fd178191bf2b285d KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 2b90f27dba..10d1348714 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-16-015443 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-18-233314 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9c1ed64a63..8992c4a20a 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-06-15-064008 +OCP_VERSION := 4.14.0-0.nightly-2023-06-18-111801