From 83b2ccff0a8c8eae7937d5ca0d069d207675643b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:08:23 +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 de3d1d44aa..0b94e17d4d 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.13.0-0.nightly-2023-06-01-050820" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-31-230630" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-06-03-192019" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-03-192022" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 62accba53dbc6deaa78143bbace3293d165277eb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:08:23 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 256 ++---------------------------- scripts/auto-rebase/commits.txt | 14 +- 2 files changed, 23 insertions(+), 247 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 7f4ef17dee..13ef3566cf 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,240 +1,16 @@ -# cluster-policy-controller embedded-component 4aa5ecd04fa2a35a5ae07a13707bd2e0239432a9 to 8d2af85d0b6dcf09256bd9fecc5d36ac77bc41d1 -ea24e47c0b27899565bc055e06aa8ee00af4ce58 2023-05-25T17:08:54+02:00 go mod vendor -5d4bcdc1f9bc8bf03898732f9771f1a032463688 2023-05-25T17:08:28+02:00 fix ClusterResourceQuotas to work for all api resources -# kubernetes embedded-component b40493584076fb1ab29f3bed1d05d16cbc5b17f1 to 0001a21b5c48ec2befb79e06949a0db8120ea413 -0361c1eebc7cec2622877acbe0036469c167af8b 2023-05-25T00:29:28+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -8d2c06f19e37d2ebb77ad9ca177d20dbfc7f7831 2023-05-25T00:02:56+00:00 UPSTREAM: : manually resolve conflicts -890a139214b4de1f01543d15003b5bda71aae9c7 2023-05-17T14:08:49+00:00 Release commit for Kubernetes v1.26.5 -b6ec911f35ac3a67f546c1e1c846dbe2ec302f5b 2023-05-05T14:54:44-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -75a7887c18bc8348d24459ace52ac59cd90053e2 2023-05-05T14:53:30-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -b486273e08592f93bed6502bd85ec3550c16d0cd 2023-05-06T00:23:57+08:00 Update podFailurePolicy comments from alpha-level to beta -1e1e86977e275496026c6873726ba88d1a8c3a9c 2023-05-04T10:51:10+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -c031391faf85125d4e73ced06a8df12a6d6b2622 2023-05-03T18:46:13+02:00 Kube-proxy/ipvs: accept access to healthCheckNodePort on LbIP -9c77d23697604226a94eb79aed18d175a4dba291 2023-05-03T11:59:53+01:00 node: device-plugin: e2e: Additional test cases -5ab0b8b80d3923d3c0d47ba824042b3625b2aadd 2023-05-03T11:59:49+01:00 node: device-plugin: add node reboot test scenario -ce301367eeea0ff12716888a4481d19d6a64628a 2023-05-03T11:58:56+01:00 node: device-plugin: e2e: Capture pod admission failure -b0711fb744a703efca7f88f93cc9021bb9e6d055 2023-05-03T11:58:28+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -3618af71607bfcb7fa4292f468d7386ad8fa3def 2023-05-03T11:58:21+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -29cb3c1655c6a0e02cc2d095efc9d71650539e2a 2023-05-03T10:25:43+01:00 node: device-mgr: e2e: Implement End to end test -ab0f78ff5c1a1c11be5dbb3a0f6650a92ca87a2c 2023-05-03T10:25:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -ca91b8c351b5307a96d30c9fb778f4de8e35b22e 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -abf8ce414411b2ecfad70f99d9aa75dbc826a5b1 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -96b51806e7442600239749cf7bf7d38ebc5e0b71 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Update test description to make it explicit -fa07d28f8b559f3c988a1eca12631c0bc07dfffc 2023-05-03T10:25:39+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -26ed893e4523675e45c913abb5450a66257d9a92 2023-05-02T19:41:53+01:00 node: device-plugin: e2e: Annotate device check with error message -a940a72b56f9a5e507a9f68e0ff5d0766d4b8b53 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -1c77cdf342d7f070a3f3b03297e7ea7a0a26759e 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -76076d5a4519507a038f7e1f72fd1789d1f39044 2023-05-02T19:41:53+01:00 test: Fix path to e2e node sample device plugin -2c38d14ea7c5e5ac8b47efca7bc824f5efb7582c 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -2c5c95da07f6843463184cdce7f064b7cb624979 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: control registration process -4ff7e0e66f214d03591be3cea849a7bbab7e1b79 2023-05-02T19:41:47+01:00 e2e: node: unify sample device plugin utilities -808ce27cae46bd31b2978875069eb7c77af21886 2023-04-29T22:27:41-04:00 Bump runc go module v1.1.4 -> v1.1.6 -e2bfa0db4441c58f53c64c4e3d9eb1dc494abfd2 2023-04-29T19:20:23+03:00 Use absolute path instead requestURI in openapiv3 discovery -8943f6ce7fac9bc81d4a585420d0c0ab7ba57142 2023-04-28T22:34:11+00:00 Correct the changelog for GlusterFS removal in 1.26. -2a17b5518c6ab9a1da749c930705b9512a480f02 2023-04-26T19:11:04+00:00 Refactors discovery content-type and helper functions -b0f1337200fd7f7f89b833848553eb0ed0f4c112 2023-04-25T12:35:12-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -2e100780a72b0e3ac3b5698d53dacafa4bb9871e 2023-04-20T10:44:11+02:00 Investigate and fix the handling of Succeeded pods in DaemonSet -d09792e3e28e7c13114ceba3c6317716e61f333a 2023-04-19T00:59:21+02:00 KCCM: add providerID predicate to service controller -7a96ba98b88e27a3bb83ab006082f9882c1e1590 2023-04-15T23:57:33+08:00 add log includes pod preemption details -401e8446a18b8b232bebee43acc1bc49f134982f 2023-04-14T08:26:35+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -23b09f8d26cb6f7a9375c6d3bf23ffcc21dcbc62 2023-04-14T11:30:47+08:00 use case-insensitive header keys for http probes -83f6cb6be707f076cd0d7e545d2771e69059bbe3 2023-04-13T16:40:31-04:00 kube-aggregator: correctly use client-go TLS cache with custom dialer -77ea6a61bb854e66d9a75c3ef8d89b733846a637 2023-04-13T13:13:19+02:00 Do not look at VPC-related resources outside the cluster's network -005e664b239a05e67d6713680bdfa9f159a621ec 2023-04-12T23:46:38-07:00 Bump konnectivity-client to 0.0.37 -e28b77e3a9584f9ae36d588acda1ed27b24702e0 2023-04-12T16:56:13-04:00 kubelet: Do not mutate pods in the pod manager -bff161d4b7c41315b9cddf966cfb5fe888280b58 2023-04-12T11:38:34-04:00 Fix azure disk e2e after migration -818177ad1b6a5089537018f952a85a63953559d4 2023-04-12T12:35:20+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.4 -f89670c3aa4059d6999cb42e23ccb4f0b9a03979 2023-04-12T12:05:34+00:00 Release commit for Kubernetes v1.26.4 -44cb625fbf3ad6c7a4a60683d755519ead760a77 2023-04-06T09:41:46+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -fb31b19f37f4c07854891482d25bbc181a65f1f5 2023-04-05T15:13:43+00:00 Return error for localhost seccomp type with no localhost profile defined -b88bbb6c62af56563df5869358380091ea3577fa 2023-03-31T11:56:35-04:00 Clean up formatting -71118bbd21124b5313b57ff5bb343e7c60bcdaa8 2023-03-22T10:38:18-04:00 Drop development dependencies from test targets -f7493edc111803cf76670174b2aeebc64a883812 2023-03-21T11:39:51-04:00 Clear front proxy headers after authentication is complete -ea85764438607cca54aa7a6210a2b9ff5b2a8c9a 2023-03-21T09:28:34-04:00 Make prerelease tag optional in CI versions -093511c2050a64cab054e42651e8f48933934c1e 2023-03-21T08:54:19-04:00 Annotate CI version regexes -2799d70d6e4c5382b6be7dcaa46d14d28ff5b399 2023-03-21T08:50:24-04:00 Drop unused regex grouping -53352e8587783533bf366532659fab88b3483332 2023-03-21T08:48:39-04:00 Update comments -170f34b1941d566f7df5b2a08ff396e47917e0dc 2023-03-21T08:48:17-04:00 Delete unused version regex function -f3ecefc31b9f40407d5af333697dbd4b12b5f289 2023-03-21T15:01:05+08:00 kubelet: Fix fs quota monitoring on volumes -cbb9d5c8011ccdebcede4b98c2584d6644c1487b 2023-03-21T15:01:04+08:00 fsquota: only generate pod uuid is nil -e6d0bca08759dbea58fef6b984178e91b1f63e21 2023-03-20T13:53:06-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -37f3890a9f87c2acfc2c77f0b4142be2ef3ca1d6 2023-03-20T11:45:33-04:00 Add integration test for DefaultBinder -02729593bac76d0d5154f0ab9e93788141d8ffb0 2023-03-20T11:19:40+01:00 API-initiated eviction: handle deleteOptions correctly -a8d2bc0ff7537bcb17e0b85333615dafd7c1e9a9 2023-03-17T13:57:06+00:00 Change where transformers are called. -67e6297764bdfc1377919b14175c3d20d97e639a 2023-03-15T17:56:04+00:00 Aggregated discovery resilient to nil GVK -475f9010f5faa7bdd439944a6f5f1ec206297602 2023-03-15T14:03:22+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.3 -4f8f98ba29db0cbf7304563218fceaf9ca0dd138 2023-03-15T09:10:12-04:00 Bump the timeout for volume expansion -0ef7c843c280cec76af44b3667f3ce08858288d6 2023-03-15T08:47:23-04:00 Wait for pod to be running before expanding -330ffd0486499e8225ed6824e9ffe75f0946db1c 2023-03-11T00:36:46+00:00 wait again on pending state -7e3936c573bc52bde01c4e7a1d87f652d2d9b67b 2023-03-11T00:36:45+00:00 cacher allow context cancellation if not ready -c79667f6de6b564d80df9e7ef3db79412cca697f 2023-03-08T22:50:27+00:00 Unlock CSIMigrationvSphere feature gate until there is a supported vSphere CSI driver available -454fb0d43be8a806e9abd6e8e78cbc4720b193c2 2023-03-08T07:17:15+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cd7deae436c328085bcb50681b06e1cc275801db 2023-02-20T09:57:13+00:00 client-go/cache: update Replace comment to be more clear -4f55d416f2e6b566eb397670b451d96712e638f1 2023-02-20T09:57:13+00:00 client-go/cache: rewrite Replace to check queue first -d7878cdf2d6a7ec82b589aa95fd83770ba3edf2d 2023-02-20T09:57:13+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -8509d70d3c33a038f0b5111a5e5696c833f6685b 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bd4ec0acec8844bddc7780d322f8fc215d045046 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace -302d46d2fd32e0fbd00f01e3b0fd820445bdcc8c 2023-01-04T11:11:58+01:00 CHANGELOG-1.26: move OpenStack in-tree provider removal to urgent notes -# machine-config-operator embedded-component 1ae3805822dfee3263bfd553d49fd36c648fbd12 to 5c5a902aeb55c02b5abda80f90fae264a2d5ad69 -40f0e659d379ee3683033572f38626c413b56ce7 2023-05-23T16:56:49+00:00 vendor in ignition 3.4 and ign-converter -8bef69da9353891fc25be4d70989ae9130ef0c33 2023-05-23T16:56:48+00:00 Add ignition kargs to MachineConfig on downgrade -b747693b5c0e354ee6c5a9c45ed4f372e09dad3d 2023-05-23T16:56:48+00:00 Add ignition 3.4 support, still default to 3.2 -5903dae60da73062e4877a694cdc75a07f749697 2023-05-23T16:56:48+00:00 Add ignition 3.3 support, still default to 3.2 -# route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 to 6667a6cbf9a87331fcc4407375118c0bb884c925 -42f6e1c5f0af79492c37c26b8247841a051b462a 2023-05-30T17:17:29+02:00 Bump k8s to 1.26.5 -# oc image-amd64 92b1a3d0e5d092430b523f6541aa0c504b2222b3 to 1024efcddde13f3a08dd1725f94d8b8bd7462b6a -5b373e439c7e444e16453a7d7c3d0077c15d5f39 2023-05-27T08:20:09+00:00 Remove closed centos7 registry from newapp unit tests -# ovn-kubernetes image-amd64 db0dbadc1a409f40345e921e991bd3e22c55490a to a69523609f7bbfa2a487e0d1bef52e194c282f90 -3fd2a222b8b5233d17ccfa03eedcedcee78ccefe 2023-04-27T17:58:32+02:00 Drop packets coming from pods headed externally that were not properly SNATed -# kubernetes image-amd64 b40493584076fb1ab29f3bed1d05d16cbc5b17f1 to 0001a21b5c48ec2befb79e06949a0db8120ea413 -0361c1eebc7cec2622877acbe0036469c167af8b 2023-05-25T00:29:28+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -8d2c06f19e37d2ebb77ad9ca177d20dbfc7f7831 2023-05-25T00:02:56+00:00 UPSTREAM: : manually resolve conflicts -890a139214b4de1f01543d15003b5bda71aae9c7 2023-05-17T14:08:49+00:00 Release commit for Kubernetes v1.26.5 -b6ec911f35ac3a67f546c1e1c846dbe2ec302f5b 2023-05-05T14:54:44-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -75a7887c18bc8348d24459ace52ac59cd90053e2 2023-05-05T14:53:30-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -b486273e08592f93bed6502bd85ec3550c16d0cd 2023-05-06T00:23:57+08:00 Update podFailurePolicy comments from alpha-level to beta -1e1e86977e275496026c6873726ba88d1a8c3a9c 2023-05-04T10:51:10+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -c031391faf85125d4e73ced06a8df12a6d6b2622 2023-05-03T18:46:13+02:00 Kube-proxy/ipvs: accept access to healthCheckNodePort on LbIP -9c77d23697604226a94eb79aed18d175a4dba291 2023-05-03T11:59:53+01:00 node: device-plugin: e2e: Additional test cases -5ab0b8b80d3923d3c0d47ba824042b3625b2aadd 2023-05-03T11:59:49+01:00 node: device-plugin: add node reboot test scenario -ce301367eeea0ff12716888a4481d19d6a64628a 2023-05-03T11:58:56+01:00 node: device-plugin: e2e: Capture pod admission failure -b0711fb744a703efca7f88f93cc9021bb9e6d055 2023-05-03T11:58:28+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -3618af71607bfcb7fa4292f468d7386ad8fa3def 2023-05-03T11:58:21+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -29cb3c1655c6a0e02cc2d095efc9d71650539e2a 2023-05-03T10:25:43+01:00 node: device-mgr: e2e: Implement End to end test -ab0f78ff5c1a1c11be5dbb3a0f6650a92ca87a2c 2023-05-03T10:25:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -ca91b8c351b5307a96d30c9fb778f4de8e35b22e 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -abf8ce414411b2ecfad70f99d9aa75dbc826a5b1 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -96b51806e7442600239749cf7bf7d38ebc5e0b71 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Update test description to make it explicit -fa07d28f8b559f3c988a1eca12631c0bc07dfffc 2023-05-03T10:25:39+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -26ed893e4523675e45c913abb5450a66257d9a92 2023-05-02T19:41:53+01:00 node: device-plugin: e2e: Annotate device check with error message -a940a72b56f9a5e507a9f68e0ff5d0766d4b8b53 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -1c77cdf342d7f070a3f3b03297e7ea7a0a26759e 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -76076d5a4519507a038f7e1f72fd1789d1f39044 2023-05-02T19:41:53+01:00 test: Fix path to e2e node sample device plugin -2c38d14ea7c5e5ac8b47efca7bc824f5efb7582c 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -2c5c95da07f6843463184cdce7f064b7cb624979 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: control registration process -4ff7e0e66f214d03591be3cea849a7bbab7e1b79 2023-05-02T19:41:47+01:00 e2e: node: unify sample device plugin utilities -808ce27cae46bd31b2978875069eb7c77af21886 2023-04-29T22:27:41-04:00 Bump runc go module v1.1.4 -> v1.1.6 -e2bfa0db4441c58f53c64c4e3d9eb1dc494abfd2 2023-04-29T19:20:23+03:00 Use absolute path instead requestURI in openapiv3 discovery -8943f6ce7fac9bc81d4a585420d0c0ab7ba57142 2023-04-28T22:34:11+00:00 Correct the changelog for GlusterFS removal in 1.26. -2a17b5518c6ab9a1da749c930705b9512a480f02 2023-04-26T19:11:04+00:00 Refactors discovery content-type and helper functions -b0f1337200fd7f7f89b833848553eb0ed0f4c112 2023-04-25T12:35:12-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -2e100780a72b0e3ac3b5698d53dacafa4bb9871e 2023-04-20T10:44:11+02:00 Investigate and fix the handling of Succeeded pods in DaemonSet -d09792e3e28e7c13114ceba3c6317716e61f333a 2023-04-19T00:59:21+02:00 KCCM: add providerID predicate to service controller -7a96ba98b88e27a3bb83ab006082f9882c1e1590 2023-04-15T23:57:33+08:00 add log includes pod preemption details -401e8446a18b8b232bebee43acc1bc49f134982f 2023-04-14T08:26:35+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -23b09f8d26cb6f7a9375c6d3bf23ffcc21dcbc62 2023-04-14T11:30:47+08:00 use case-insensitive header keys for http probes -83f6cb6be707f076cd0d7e545d2771e69059bbe3 2023-04-13T16:40:31-04:00 kube-aggregator: correctly use client-go TLS cache with custom dialer -77ea6a61bb854e66d9a75c3ef8d89b733846a637 2023-04-13T13:13:19+02:00 Do not look at VPC-related resources outside the cluster's network -005e664b239a05e67d6713680bdfa9f159a621ec 2023-04-12T23:46:38-07:00 Bump konnectivity-client to 0.0.37 -e28b77e3a9584f9ae36d588acda1ed27b24702e0 2023-04-12T16:56:13-04:00 kubelet: Do not mutate pods in the pod manager -bff161d4b7c41315b9cddf966cfb5fe888280b58 2023-04-12T11:38:34-04:00 Fix azure disk e2e after migration -818177ad1b6a5089537018f952a85a63953559d4 2023-04-12T12:35:20+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.4 -f89670c3aa4059d6999cb42e23ccb4f0b9a03979 2023-04-12T12:05:34+00:00 Release commit for Kubernetes v1.26.4 -44cb625fbf3ad6c7a4a60683d755519ead760a77 2023-04-06T09:41:46+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -fb31b19f37f4c07854891482d25bbc181a65f1f5 2023-04-05T15:13:43+00:00 Return error for localhost seccomp type with no localhost profile defined -b88bbb6c62af56563df5869358380091ea3577fa 2023-03-31T11:56:35-04:00 Clean up formatting -71118bbd21124b5313b57ff5bb343e7c60bcdaa8 2023-03-22T10:38:18-04:00 Drop development dependencies from test targets -f7493edc111803cf76670174b2aeebc64a883812 2023-03-21T11:39:51-04:00 Clear front proxy headers after authentication is complete -ea85764438607cca54aa7a6210a2b9ff5b2a8c9a 2023-03-21T09:28:34-04:00 Make prerelease tag optional in CI versions -093511c2050a64cab054e42651e8f48933934c1e 2023-03-21T08:54:19-04:00 Annotate CI version regexes -2799d70d6e4c5382b6be7dcaa46d14d28ff5b399 2023-03-21T08:50:24-04:00 Drop unused regex grouping -53352e8587783533bf366532659fab88b3483332 2023-03-21T08:48:39-04:00 Update comments -170f34b1941d566f7df5b2a08ff396e47917e0dc 2023-03-21T08:48:17-04:00 Delete unused version regex function -f3ecefc31b9f40407d5af333697dbd4b12b5f289 2023-03-21T15:01:05+08:00 kubelet: Fix fs quota monitoring on volumes -cbb9d5c8011ccdebcede4b98c2584d6644c1487b 2023-03-21T15:01:04+08:00 fsquota: only generate pod uuid is nil -e6d0bca08759dbea58fef6b984178e91b1f63e21 2023-03-20T13:53:06-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -37f3890a9f87c2acfc2c77f0b4142be2ef3ca1d6 2023-03-20T11:45:33-04:00 Add integration test for DefaultBinder -02729593bac76d0d5154f0ab9e93788141d8ffb0 2023-03-20T11:19:40+01:00 API-initiated eviction: handle deleteOptions correctly -a8d2bc0ff7537bcb17e0b85333615dafd7c1e9a9 2023-03-17T13:57:06+00:00 Change where transformers are called. -67e6297764bdfc1377919b14175c3d20d97e639a 2023-03-15T17:56:04+00:00 Aggregated discovery resilient to nil GVK -475f9010f5faa7bdd439944a6f5f1ec206297602 2023-03-15T14:03:22+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.3 -4f8f98ba29db0cbf7304563218fceaf9ca0dd138 2023-03-15T09:10:12-04:00 Bump the timeout for volume expansion -0ef7c843c280cec76af44b3667f3ce08858288d6 2023-03-15T08:47:23-04:00 Wait for pod to be running before expanding -330ffd0486499e8225ed6824e9ffe75f0946db1c 2023-03-11T00:36:46+00:00 wait again on pending state -7e3936c573bc52bde01c4e7a1d87f652d2d9b67b 2023-03-11T00:36:45+00:00 cacher allow context cancellation if not ready -c79667f6de6b564d80df9e7ef3db79412cca697f 2023-03-08T22:50:27+00:00 Unlock CSIMigrationvSphere feature gate until there is a supported vSphere CSI driver available -454fb0d43be8a806e9abd6e8e78cbc4720b193c2 2023-03-08T07:17:15+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cd7deae436c328085bcb50681b06e1cc275801db 2023-02-20T09:57:13+00:00 client-go/cache: update Replace comment to be more clear -4f55d416f2e6b566eb397670b451d96712e638f1 2023-02-20T09:57:13+00:00 client-go/cache: rewrite Replace to check queue first -d7878cdf2d6a7ec82b589aa95fd83770ba3edf2d 2023-02-20T09:57:13+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -8509d70d3c33a038f0b5111a5e5696c833f6685b 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bd4ec0acec8844bddc7780d322f8fc215d045046 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace -302d46d2fd32e0fbd00f01e3b0fd820445bdcc8c 2023-01-04T11:11:58+01:00 CHANGELOG-1.26: move OpenStack in-tree provider removal to urgent notes -# oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3 to 1024efcddde13f3a08dd1725f94d8b8bd7462b6a -5b373e439c7e444e16453a7d7c3d0077c15d5f39 2023-05-27T08:20:09+00:00 Remove closed centos7 registry from newapp unit tests -# ovn-kubernetes image-arm64 db0dbadc1a409f40345e921e991bd3e22c55490a to a69523609f7bbfa2a487e0d1bef52e194c282f90 -3fd2a222b8b5233d17ccfa03eedcedcee78ccefe 2023-04-27T17:58:32+02:00 Drop packets coming from pods headed externally that were not properly SNATed -# kubernetes image-arm64 b40493584076fb1ab29f3bed1d05d16cbc5b17f1 to 0001a21b5c48ec2befb79e06949a0db8120ea413 -0361c1eebc7cec2622877acbe0036469c167af8b 2023-05-25T00:29:28+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -8d2c06f19e37d2ebb77ad9ca177d20dbfc7f7831 2023-05-25T00:02:56+00:00 UPSTREAM: : manually resolve conflicts -890a139214b4de1f01543d15003b5bda71aae9c7 2023-05-17T14:08:49+00:00 Release commit for Kubernetes v1.26.5 -b6ec911f35ac3a67f546c1e1c846dbe2ec302f5b 2023-05-05T14:54:44-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -75a7887c18bc8348d24459ace52ac59cd90053e2 2023-05-05T14:53:30-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -b486273e08592f93bed6502bd85ec3550c16d0cd 2023-05-06T00:23:57+08:00 Update podFailurePolicy comments from alpha-level to beta -1e1e86977e275496026c6873726ba88d1a8c3a9c 2023-05-04T10:51:10+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -c031391faf85125d4e73ced06a8df12a6d6b2622 2023-05-03T18:46:13+02:00 Kube-proxy/ipvs: accept access to healthCheckNodePort on LbIP -9c77d23697604226a94eb79aed18d175a4dba291 2023-05-03T11:59:53+01:00 node: device-plugin: e2e: Additional test cases -5ab0b8b80d3923d3c0d47ba824042b3625b2aadd 2023-05-03T11:59:49+01:00 node: device-plugin: add node reboot test scenario -ce301367eeea0ff12716888a4481d19d6a64628a 2023-05-03T11:58:56+01:00 node: device-plugin: e2e: Capture pod admission failure -b0711fb744a703efca7f88f93cc9021bb9e6d055 2023-05-03T11:58:28+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -3618af71607bfcb7fa4292f468d7386ad8fa3def 2023-05-03T11:58:21+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -29cb3c1655c6a0e02cc2d095efc9d71650539e2a 2023-05-03T10:25:43+01:00 node: device-mgr: e2e: Implement End to end test -ab0f78ff5c1a1c11be5dbb3a0f6650a92ca87a2c 2023-05-03T10:25:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -ca91b8c351b5307a96d30c9fb778f4de8e35b22e 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -abf8ce414411b2ecfad70f99d9aa75dbc826a5b1 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -96b51806e7442600239749cf7bf7d38ebc5e0b71 2023-05-03T10:25:43+01:00 node: device-plugin: e2e: Update test description to make it explicit -fa07d28f8b559f3c988a1eca12631c0bc07dfffc 2023-05-03T10:25:39+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -26ed893e4523675e45c913abb5450a66257d9a92 2023-05-02T19:41:53+01:00 node: device-plugin: e2e: Annotate device check with error message -a940a72b56f9a5e507a9f68e0ff5d0766d4b8b53 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -1c77cdf342d7f070a3f3b03297e7ea7a0a26759e 2023-05-02T19:41:53+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -76076d5a4519507a038f7e1f72fd1789d1f39044 2023-05-02T19:41:53+01:00 test: Fix path to e2e node sample device plugin -2c38d14ea7c5e5ac8b47efca7bc824f5efb7582c 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -2c5c95da07f6843463184cdce7f064b7cb624979 2023-05-02T19:41:53+01:00 node: device-mgr: sample device plugin: control registration process -4ff7e0e66f214d03591be3cea849a7bbab7e1b79 2023-05-02T19:41:47+01:00 e2e: node: unify sample device plugin utilities -808ce27cae46bd31b2978875069eb7c77af21886 2023-04-29T22:27:41-04:00 Bump runc go module v1.1.4 -> v1.1.6 -e2bfa0db4441c58f53c64c4e3d9eb1dc494abfd2 2023-04-29T19:20:23+03:00 Use absolute path instead requestURI in openapiv3 discovery -8943f6ce7fac9bc81d4a585420d0c0ab7ba57142 2023-04-28T22:34:11+00:00 Correct the changelog for GlusterFS removal in 1.26. -2a17b5518c6ab9a1da749c930705b9512a480f02 2023-04-26T19:11:04+00:00 Refactors discovery content-type and helper functions -b0f1337200fd7f7f89b833848553eb0ed0f4c112 2023-04-25T12:35:12-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -2e100780a72b0e3ac3b5698d53dacafa4bb9871e 2023-04-20T10:44:11+02:00 Investigate and fix the handling of Succeeded pods in DaemonSet -d09792e3e28e7c13114ceba3c6317716e61f333a 2023-04-19T00:59:21+02:00 KCCM: add providerID predicate to service controller -7a96ba98b88e27a3bb83ab006082f9882c1e1590 2023-04-15T23:57:33+08:00 add log includes pod preemption details -401e8446a18b8b232bebee43acc1bc49f134982f 2023-04-14T08:26:35+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -23b09f8d26cb6f7a9375c6d3bf23ffcc21dcbc62 2023-04-14T11:30:47+08:00 use case-insensitive header keys for http probes -83f6cb6be707f076cd0d7e545d2771e69059bbe3 2023-04-13T16:40:31-04:00 kube-aggregator: correctly use client-go TLS cache with custom dialer -77ea6a61bb854e66d9a75c3ef8d89b733846a637 2023-04-13T13:13:19+02:00 Do not look at VPC-related resources outside the cluster's network -005e664b239a05e67d6713680bdfa9f159a621ec 2023-04-12T23:46:38-07:00 Bump konnectivity-client to 0.0.37 -e28b77e3a9584f9ae36d588acda1ed27b24702e0 2023-04-12T16:56:13-04:00 kubelet: Do not mutate pods in the pod manager -bff161d4b7c41315b9cddf966cfb5fe888280b58 2023-04-12T11:38:34-04:00 Fix azure disk e2e after migration -818177ad1b6a5089537018f952a85a63953559d4 2023-04-12T12:35:20+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.4 -f89670c3aa4059d6999cb42e23ccb4f0b9a03979 2023-04-12T12:05:34+00:00 Release commit for Kubernetes v1.26.4 -44cb625fbf3ad6c7a4a60683d755519ead760a77 2023-04-06T09:41:46+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -fb31b19f37f4c07854891482d25bbc181a65f1f5 2023-04-05T15:13:43+00:00 Return error for localhost seccomp type with no localhost profile defined -b88bbb6c62af56563df5869358380091ea3577fa 2023-03-31T11:56:35-04:00 Clean up formatting -71118bbd21124b5313b57ff5bb343e7c60bcdaa8 2023-03-22T10:38:18-04:00 Drop development dependencies from test targets -f7493edc111803cf76670174b2aeebc64a883812 2023-03-21T11:39:51-04:00 Clear front proxy headers after authentication is complete -ea85764438607cca54aa7a6210a2b9ff5b2a8c9a 2023-03-21T09:28:34-04:00 Make prerelease tag optional in CI versions -093511c2050a64cab054e42651e8f48933934c1e 2023-03-21T08:54:19-04:00 Annotate CI version regexes -2799d70d6e4c5382b6be7dcaa46d14d28ff5b399 2023-03-21T08:50:24-04:00 Drop unused regex grouping -53352e8587783533bf366532659fab88b3483332 2023-03-21T08:48:39-04:00 Update comments -170f34b1941d566f7df5b2a08ff396e47917e0dc 2023-03-21T08:48:17-04:00 Delete unused version regex function -f3ecefc31b9f40407d5af333697dbd4b12b5f289 2023-03-21T15:01:05+08:00 kubelet: Fix fs quota monitoring on volumes -cbb9d5c8011ccdebcede4b98c2584d6644c1487b 2023-03-21T15:01:04+08:00 fsquota: only generate pod uuid is nil -e6d0bca08759dbea58fef6b984178e91b1f63e21 2023-03-20T13:53:06-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -37f3890a9f87c2acfc2c77f0b4142be2ef3ca1d6 2023-03-20T11:45:33-04:00 Add integration test for DefaultBinder -02729593bac76d0d5154f0ab9e93788141d8ffb0 2023-03-20T11:19:40+01:00 API-initiated eviction: handle deleteOptions correctly -a8d2bc0ff7537bcb17e0b85333615dafd7c1e9a9 2023-03-17T13:57:06+00:00 Change where transformers are called. -67e6297764bdfc1377919b14175c3d20d97e639a 2023-03-15T17:56:04+00:00 Aggregated discovery resilient to nil GVK -475f9010f5faa7bdd439944a6f5f1ec206297602 2023-03-15T14:03:22+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.3 -4f8f98ba29db0cbf7304563218fceaf9ca0dd138 2023-03-15T09:10:12-04:00 Bump the timeout for volume expansion -0ef7c843c280cec76af44b3667f3ce08858288d6 2023-03-15T08:47:23-04:00 Wait for pod to be running before expanding -330ffd0486499e8225ed6824e9ffe75f0946db1c 2023-03-11T00:36:46+00:00 wait again on pending state -7e3936c573bc52bde01c4e7a1d87f652d2d9b67b 2023-03-11T00:36:45+00:00 cacher allow context cancellation if not ready -c79667f6de6b564d80df9e7ef3db79412cca697f 2023-03-08T22:50:27+00:00 Unlock CSIMigrationvSphere feature gate until there is a supported vSphere CSI driver available -454fb0d43be8a806e9abd6e8e78cbc4720b193c2 2023-03-08T07:17:15+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cd7deae436c328085bcb50681b06e1cc275801db 2023-02-20T09:57:13+00:00 client-go/cache: update Replace comment to be more clear -4f55d416f2e6b566eb397670b451d96712e638f1 2023-02-20T09:57:13+00:00 client-go/cache: rewrite Replace to check queue first -d7878cdf2d6a7ec82b589aa95fd83770ba3edf2d 2023-02-20T09:57:13+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -8509d70d3c33a038f0b5111a5e5696c833f6685b 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bd4ec0acec8844bddc7780d322f8fc215d045046 2023-02-20T09:57:13+00:00 client-go/cache: fix missing delete event on replace -302d46d2fd32e0fbd00f01e3b0fd820445bdcc8c 2023-01-04T11:11:58+01:00 CHANGELOG-1.26: move OpenStack in-tree provider removal to urgent notes +# cluster-ingress-operator embedded-component 7262c34b3a6434b49851ff5f0cceec87a2ee9706 to 502e3517f8f10b7d36c7d9d78197db49dae7f2e6 +385e4620ea49da663e1ffdc7fa39d2c6df17ca85 2023-04-28T16:31:10+00:00 gatewayclass: Update for OSSM 2.4 API change +# cluster-network-operator embedded-component 3ed6bef191d49ede92ab8f7f684826a1b7967928 to 924fd3c589f0dc345807550965ef80099311b82a +67ee7aff147b5dffc37583bdcd343b1430f47d15 2023-05-31T16:08:07+00:00 Remove allowlist reconciler namespace check +9820366d3eeba2e21bdf2a3f29505c7f0f8cb696 2023-05-31T16:08:07+00:00 Update operconfig to only have one recurring reconciler +1001e2edf3f4b4cc9902ed256721a4e93b965611 2023-05-31T16:08:07+00:00 Update allowlist reconciler to watch specific namespace +# kubernetes embedded-component 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 +8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy +# oc image-amd64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a to 05d83eff7e17160e679898a2a5cd6019ec252c49 +340032ed100b1a4e5380a9d2d0dae483df9fcec8 2023-05-30T07:10:15+00:00 preserve explicit release image +# kubernetes image-amd64 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 +8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy +# oc image-arm64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a to 05d83eff7e17160e679898a2a5cd6019ec252c49 +340032ed100b1a4e5380a9d2d0dae483df9fcec8 2023-05-30T07:10:15+00:00 preserve explicit release image +# kubernetes image-arm64 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 +8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index cf9346f5be..e2de7c2ef7 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,28 @@ https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a -https://github.com/openshift/cluster-ingress-operator embedded-component 7262c34b3a6434b49851ff5f0cceec87a2ee9706 +https://github.com/openshift/cluster-ingress-operator embedded-component 502e3517f8f10b7d36c7d9d78197db49dae7f2e6 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 02ea4a4120dd0f8eb49d070b1fe420ed6d1debba https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 56b970786d152344f0d4762c8271d20e5fc9d28b https://github.com/openshift/cluster-kube-scheduler-operator embedded-component dc5cba57ddcdb5a4b43240d1c2ab908fa953d887 -https://github.com/openshift/cluster-network-operator embedded-component 3ed6bef191d49ede92ab8f7f684826a1b7967928 +https://github.com/openshift/cluster-network-operator embedded-component 924fd3c589f0dc345807550965ef80099311b82a https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88 https://github.com/openshift/cluster-policy-controller embedded-component 8d2af85d0b6dcf09256bd9fecc5d36ac77bc41d1 https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d -https://github.com/openshift/kubernetes embedded-component 0001a21b5c48ec2befb79e06949a0db8120ea413 +https://github.com/openshift/kubernetes embedded-component 7a891f05c7beb9527024c7616d95f6ff5c309f27 https://github.com/openshift/machine-config-operator embedded-component 5c5a902aeb55c02b5abda80f90fae264a2d5ad69 https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9 https://github.com/openshift/route-controller-manager embedded-component 6667a6cbf9a87331fcc4407375118c0bb884c925 https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-amd64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a +https://github.com/openshift/oc image-amd64 05d83eff7e17160e679898a2a5cd6019ec252c49 https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d https://github.com/openshift/kube-rbac-proxy image-amd64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 https://github.com/openshift/ovn-kubernetes image-amd64 a69523609f7bbfa2a487e0d1bef52e194c282f90 -https://github.com/openshift/kubernetes image-amd64 0001a21b5c48ec2befb79e06949a0db8120ea413 +https://github.com/openshift/kubernetes image-amd64 7a891f05c7beb9527024c7616d95f6ff5c309f27 https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-arm64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a +https://github.com/openshift/oc image-arm64 05d83eff7e17160e679898a2a5cd6019ec252c49 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 https://github.com/openshift/ovn-kubernetes image-arm64 a69523609f7bbfa2a487e0d1bef52e194c282f90 -https://github.com/openshift/kubernetes image-arm64 0001a21b5c48ec2befb79e06949a0db8120ea413 +https://github.com/openshift/kubernetes image-arm64 7a891f05c7beb9527024c7616d95f6ff5c309f27 https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a From 0ada0aa992bbc1c46a324230af522265e9196339 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:09:33 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 60 ++++++++++++++++----------------- go.sum | 102 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/go.mod b/go.mod index aedbbd1ff9..cb44c24a8d 100644 --- a/go.mod +++ b/go.mod @@ -231,34 +231,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230525151823-0001a21b5c48 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525151823-0001a21b5c48 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230531192419-7a891f05c7be // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230531192419-7a891f05c7be // from kubernetes ) diff --git a/go.sum b/go.sum index 0cb17442e3..25e07a9e9a 100644 --- a/go.sum +++ b/go.sum @@ -609,57 +609,57 @@ github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qY github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo= github.com/openshift/cluster-policy-controller v0.0.0-20230525174645-8d2af85d0b6d h1:PkL2Y+EWd8L3FE6tLWeS6iniDV3n/+q9yFeyUixBiDU= github.com/openshift/cluster-policy-controller v0.0.0-20230525174645-8d2af85d0b6d/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230525151823-0001a21b5c48 h1:JCDt1cIYSR8tmBg9ouyBec+49wI3w1Nxqa7/jdtpkto= -github.com/openshift/kubernetes v0.0.0-20230525151823-0001a21b5c48/go.mod h1:u3MeEImeHq5jZoHhKGKXg+Oxvurj9zOySrh4xQY+5v4= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 h1:6RjIiCa4GjAr/629mPuGYfXPl+GXTUCjtIN5yQY3zW0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48/go.mod h1:uLYjAyw1JyCS9EUj6oUhl4eRy4XthcFpSodl6cOokQI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 h1:habVndiURaOlpVaIaeiIDPBmlFt4Grumb78jHMfURzo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48/go.mod h1:6nUDc49G5VCzbMIQmnSPzprEBPF/Ycz0MG2c0AYLBj4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 h1:2Zmpi+EDBsILaXwDx+8JaWHcUzPixRqDxc4wf/H3aDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48/go.mod h1:ApuQzVQOyTrgHIGrmVljD8zZ+ZoHmXYbsFwLvSelf84= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 h1:Yi4t8L3WToFGysBaQNl3BjxabKCeIM8ArzbwamZh0lQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48/go.mod h1:uUHmsJ+bXXAixL7p1LCqavjxw1wAisdJvZbwUDnJU0I= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 h1:jwZDbCrZdVKjxsk+I+uXBuadEHTQOWAhgB7BI/DISUg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48/go.mod h1:LumLfFU84tK2qax1WpUviAosYlqlUaSJTIEtYjYpfxw= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 h1:W11kuy7UAV6PF6R67dNBKpbQ0UriFztleOPhK45SBew= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48/go.mod h1:0QH/+sNaHFjTGTSyuwBXuHHhyBRa2r6ndYXUxchMPKI= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48 h1:mCXNjY3/EYBt9o7FFIYME5dlr9x380SIbywcRCkLtAo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48/go.mod h1:z7eXWAQzxEU/ijBZNI9bJXjMR14CW23MNLzAj7XgW24= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48 h1:/81FdjN0ruMPmjMcaZ98ovtNr3odQZaye3e5oM9iU0E= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48/go.mod h1:CHVYBTORnxNcEy4sP3o5mXQCtQ+xakaDn7H4irLH4hE= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525151823-0001a21b5c48/go.mod h1:RPAt1JMA66rIEi+T0Dm3inLGbyc8PsaIoRuh006OoKQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 h1:OBnNR17XY4dItGusmd90DFppjYEHibvUXKneVvffDHU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48/go.mod h1:4bzeXuIaKw5yabxEcNwxVYHKi0wLgcjl5naBxe4N1cw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 h1:EvQwG1JjudZLe/FBnEraX5Hyhs32zoxqYLwjmrDxy3A= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48/go.mod h1:1kjV28ccOe1eJI0U3RSRTXDv8PSWILLyDrRHnlN0b5Q= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 h1:O/Z0toW0Uv61cMg6U+7kcCdnVFP9PRKM8toeV1tj60I= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48/go.mod h1:hffUS55x0rZKJgDDZgnJ0Mw0okh0hnLj7dVQL1V18ks= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48 h1:C1kF50ZE0uo7FZjt7Mg16XsIwdCY35sGcn++HYFikUE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48/go.mod h1:sjqtRwsq9OIu27wzHZyTUxhszi4BTrLOZUP3XxMT3ac= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48 h1:f2OPVTLQqOwAAbkMnFwW/CvNdyiuKtg//vu8shbJj8A= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48/go.mod h1:3iftQXweshE6LzQ4a0nccCFroiXuvkd0Tv0yVhVZo3g= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48 h1:vUDUuZwOsMBhJxaUIwcH5GFaoWu0EdRNQHj50b5X1Oo= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48/go.mod h1:i5+I2dCeC47HR6g0aFW6nr1wNfWRlyFmiSDs2NqFs3I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 h1:4yHHVWEdJ/ShkpE74WCxO3NgtcFfKu43qCN91dIA+n0= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48/go.mod h1:uzei6+XRNkQICBV+e8BACOZwRpfWPvpZ6bVCWYsuxfQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 h1:7GuYlM+xxCMR/wKotxldgm3TGGBL8UYVhIrvPYkps8o= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48/go.mod h1:0VVVUwvZ0teYPb8uxBiQDY3oXB0aCw96qBeMF2aizqk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48 h1:2kGnLShCm3b6B7lncyJoCL5hKSsiRpz0W1G3WtDbW/A= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48/go.mod h1:W/OyRa4Ahdv09yt5iHcxSrTCn2yg33rlMqo9yW1GFm0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48 h1:iTVDkrLntFI+0isgX7sWevJ9d9Bxrt5Hu2vaDatW6TA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48/go.mod h1:gAOk6X5CwD031FqXVf7CD4yQdou7UUUmP0FmRqCGPUI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 h1:MRXNxLQYVriLtgFXPibRh+p8RlZ9QqbyNbvkrKavtbA= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48/go.mod h1:plN+kBQozEYwSUD3aB9oFwrpkVeIN5xVpQ6sLRbSiNs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48 h1:efZKvteO3Hu8mpMFVhUP9MThP5xpxKR8eW0RISRcUlA= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48/go.mod h1:au5YzS8yhxLz767EWIVfabqOrCtMfjppQRDQ+BPnNCE= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48 h1:xS7T7zVcCkQsU0yqHVHcpIW9GLFNe8KWi2fedwTqwaw= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48/go.mod h1:j7EjbuGsi5n1jhuQ1s2xbgsV4H5MOY6iTjtp+CaBsh0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48 h1:X6cQ6UfxOwt3LGqsgsMiTTycIklG9e8eVjtv/m1+DL4= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48/go.mod h1:0XHkNqJcpcb3wT61pTKmEWoX8uuV9Q5N2Z48NrDYdww= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48 h1:IMT/+7ucjWTwa6Vk0JXKavYNIprDELKQ2UdFSdAOXJ4= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48/go.mod h1:Xv4esSdxyeauCQqd77P5rMAjH8eAhtUfZjgykqPkXIg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 h1:BPFTl7NjxHEhK0zfu7lgmXhGlqGo2whL0DhFnNY1rV0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48/go.mod h1:UWqTwuGuunsOoC1xk4zvuSXWyFu62HoMafWgzVyxmbc= +github.com/openshift/kubernetes v0.0.0-20230531192419-7a891f05c7be h1:GnFk7yGeucGSpfK5sEiL4Iu006mqzFE4OASNq1dR4+A= +github.com/openshift/kubernetes v0.0.0-20230531192419-7a891f05c7be/go.mod h1:u3MeEImeHq5jZoHhKGKXg+Oxvurj9zOySrh4xQY+5v4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be h1:0CAzgBFwA+FIoB1hEiKW/EAnWH/LV7CuBaNNexLHm2I= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be/go.mod h1:uLYjAyw1JyCS9EUj6oUhl4eRy4XthcFpSodl6cOokQI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be h1:Y3+1Lt8atZtwZ36IkOwpjwFqDBvVRvdE0ySGpFDzJUA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be/go.mod h1:6nUDc49G5VCzbMIQmnSPzprEBPF/Ycz0MG2c0AYLBj4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be h1:C7yw98FMcRd7VSSqIb9/LwArIK32vh8BcY+HZ+HfXeY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be/go.mod h1:ApuQzVQOyTrgHIGrmVljD8zZ+ZoHmXYbsFwLvSelf84= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be h1:/T0YFH0sYsN8aabBF6MlWok44T8tyI7JZrLlDg0m21Y= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be/go.mod h1:uUHmsJ+bXXAixL7p1LCqavjxw1wAisdJvZbwUDnJU0I= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be h1:LwCCgwt1xZR9h+FwEY7kRnHxudqOqNGF+oleY7eDWAM= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be/go.mod h1:LumLfFU84tK2qax1WpUviAosYlqlUaSJTIEtYjYpfxw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be h1:NzaTuZR+DRilkvSyEb9ZWpXTtLDU5QPvS6+51mPGCZE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be/go.mod h1:0QH/+sNaHFjTGTSyuwBXuHHhyBRa2r6ndYXUxchMPKI= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be h1:43QmnhxG4WMefXBDVVZBw4u/ZBbtQJPMrqnlceCLdTY= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be/go.mod h1:z7eXWAQzxEU/ijBZNI9bJXjMR14CW23MNLzAj7XgW24= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be h1:HUyzttVpOAIu2T71JfR9FxMt9BMH4+IyOYpMRlLYthA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be/go.mod h1:CHVYBTORnxNcEy4sP3o5mXQCtQ+xakaDn7H4irLH4hE= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230531192419-7a891f05c7be/go.mod h1:RPAt1JMA66rIEi+T0Dm3inLGbyc8PsaIoRuh006OoKQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be h1:QSkvti9F0rhrUFx2VlnkV54Q/zQANciA3jkmj/hJYVE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be/go.mod h1:4bzeXuIaKw5yabxEcNwxVYHKi0wLgcjl5naBxe4N1cw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be h1:PGGilXcJhVxVC0gUiT2uXaEtqsafW7JZWdHMINVhnPA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be/go.mod h1:1kjV28ccOe1eJI0U3RSRTXDv8PSWILLyDrRHnlN0b5Q= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be h1:hyL4jZMrqMZCfuwJTG/OLkfNMazqrl4dOf/bsMPH1LQ= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be/go.mod h1:hffUS55x0rZKJgDDZgnJ0Mw0okh0hnLj7dVQL1V18ks= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be h1:oqMytWsmGugdLSys2lsghLUUM7Wk8cHDvS7N3TwxhFQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be/go.mod h1:sjqtRwsq9OIu27wzHZyTUxhszi4BTrLOZUP3XxMT3ac= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be h1:Q8NSrxsqqEsTNiQNIKlxynlgAoIgy+S2pmdjwUR2rrU= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be/go.mod h1:3iftQXweshE6LzQ4a0nccCFroiXuvkd0Tv0yVhVZo3g= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be h1:9GiE3AYDcIGhJSZH7Az/mlfbkm+MsV8bmtdKm+UWeMs= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be/go.mod h1:i5+I2dCeC47HR6g0aFW6nr1wNfWRlyFmiSDs2NqFs3I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be h1:c2as/zfnDP99Dgpz1MpYCZWUg+5pH0bklR7sx53UP6M= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be/go.mod h1:uzei6+XRNkQICBV+e8BACOZwRpfWPvpZ6bVCWYsuxfQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be h1:b6PnRvMsX6f/LviDoMyAHfDwD8eGvn/yK5S4AivnNSA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be/go.mod h1:0VVVUwvZ0teYPb8uxBiQDY3oXB0aCw96qBeMF2aizqk= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be h1:CKFuXmNy/PyOc9h3asAGol1Ho/7K1g7wspoYBNINkbs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be/go.mod h1:W/OyRa4Ahdv09yt5iHcxSrTCn2yg33rlMqo9yW1GFm0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be h1:itRXrrPinbK861wmmJ4tdSe85RH8ctAAzPJyGTCyZpE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be/go.mod h1:gAOk6X5CwD031FqXVf7CD4yQdou7UUUmP0FmRqCGPUI= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be h1:bp0l5Qqvu6/8G6/b7k6B+Eh2ENbzvoMdFr6B0VvNleQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be/go.mod h1:plN+kBQozEYwSUD3aB9oFwrpkVeIN5xVpQ6sLRbSiNs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be h1:kNZnVbjZssUgkPgH1TSYDcq4/hKTl9MQZDS1oP/Gmy8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be/go.mod h1:au5YzS8yhxLz767EWIVfabqOrCtMfjppQRDQ+BPnNCE= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be h1:snJuf/waNVU+8gMoG9vB2nYjR7JYzdKexL3CMEIBzVY= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be/go.mod h1:j7EjbuGsi5n1jhuQ1s2xbgsV4H5MOY6iTjtp+CaBsh0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be h1:aZegthaaCQK+PVMMaWBgs2Q3WRNqT5p0yL7eLQXmCDE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be/go.mod h1:0XHkNqJcpcb3wT61pTKmEWoX8uuV9Q5N2Z48NrDYdww= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be h1:sEMZ/w/9QEtv5jbZhG1vfVHM0uk+fPmUYpq1s+/GUMI= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be/go.mod h1:Xv4esSdxyeauCQqd77P5rMAjH8eAhtUfZjgykqPkXIg= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be h1:SFzm05ECjOf4UAn+tsOe7DsrCi3UGjBzxsXFc5QmB8c= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be/go.mod h1:UWqTwuGuunsOoC1xk4zvuSXWyFu62HoMafWgzVyxmbc= github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 h1:B9e1Sga7Q6iSI1YgzLgfABo+LDET7HZngJ+tKlrwVSk= github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= From 6a12fade230ce5220b95150d5b2c0869146f32aa Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:09:58 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../pkg/kubelet/cm/cgroup_manager_linux.go | 13 ++- .../kubelet/cm/cgroup_manager_unsupported.go | 3 + .../pkg/kubelet/cm/container_manager_linux.go | 3 + .../k8s.io/kubernetes/pkg/kubelet/cm/types.go | 2 + vendor/modules.txt | 110 +++++++++--------- 5 files changed, 73 insertions(+), 58 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_linux.go index e7c6fc66c0..d4f49715a0 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_linux.go @@ -38,7 +38,6 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" cmutil "k8s.io/kubernetes/pkg/kubelet/cm/util" - "k8s.io/kubernetes/pkg/kubelet/managed" "k8s.io/kubernetes/pkg/kubelet/metrics" ) @@ -148,6 +147,10 @@ type cgroupManagerImpl struct { // useSystemd tells if systemd cgroup manager should be used. useSystemd bool + + // cpuLoadBalanceDisable tells whether kubelet should disable + // cpu load balancing on new cgroups it creates. + cpuLoadBalanceDisable bool } // Make sure that cgroupManagerImpl implements the CgroupManager interface @@ -474,10 +477,10 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error { utilruntime.HandleError(fmt.Errorf("cgroup manager.Set failed: %w", err)) } - // Disable cpuset.sched_load_balance for all cgroups Kubelet creates when kubelet has workloads to manage. + // Disable cpuset.sched_load_balance for all cgroups Kubelet creates. // This way, CRI can disable sched_load_balance for pods that must have load balance // disabled, but the slices can contain all cpus (as the guaranteed cpus are known dynamically). - if managed.IsEnabled() && !libcontainercgroups.IsCgroup2UnifiedMode() { + if m.cpuLoadBalanceDisable && !libcontainercgroups.IsCgroup2UnifiedMode() { path := manager.Path("cpuset") if path == "" { return fmt.Errorf("Failed to find cpuset for newly created cgroup") @@ -572,3 +575,7 @@ func (m *cgroupManagerImpl) MemoryUsage(name CgroupName) (int64, error) { val, err := fscommon.GetCgroupParamUint(path, file) return int64(val), err } + +func (m *cgroupManagerImpl) SetCPULoadBalanceDisable() { + m.cpuLoadBalanceDisable = true +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_unsupported.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_unsupported.go index 684a1f12f2..657015ac66 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_unsupported.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cgroup_manager_unsupported.go @@ -77,6 +77,9 @@ func (m *unsupportedCgroupManager) ReduceCPULimits(cgroupName CgroupName) error return nil } +func (m *unsupportedCgroupManager) SetCPULoadBalanceDisable() { +} + var RootCgroupName = CgroupName([]string{}) func NewCgroupName(base CgroupName, components ...string) CgroupName { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go index 332e99e72e..2047dd7b29 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go @@ -250,6 +250,9 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I // Turn CgroupRoot from a string (in cgroupfs path format) to internal CgroupName cgroupRoot := ParseCgroupfsToCgroupName(nodeConfig.CgroupRoot) cgroupManager := NewCgroupManager(subsystems, nodeConfig.CgroupDriver) + if nodeConfig.CPUManagerPolicy == string(cpumanager.PolicyStatic) { + cgroupManager.SetCPULoadBalanceDisable() + } // Check if Cgroup-root actually exists on the node if nodeConfig.CgroupsPerQOS { // this does default to / when enabled, but this tests against regressions. diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/types.go index edf9733478..323ac7a639 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/types.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/types.go @@ -84,6 +84,8 @@ type CgroupManager interface { ReduceCPULimits(cgroupName CgroupName) error // MemoryUsage returns current memory usage of the specified cgroup, as read from the cgroupfs. MemoryUsage(name CgroupName) (int64, error) + // Toggle whether CPU load balancing should be disabled for new cgroups the kubelet creates + SetCPULoadBalanceDisable() } // QOSContainersInfo stores the names of containers per qos diff --git a/vendor/modules.txt b/vendor/modules.txt index 46c28f41f0..afb1422f10 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1362,7 +1362,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/api v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1462,7 +1462,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/apimachinery v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1526,7 +1526,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/apiserver v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1680,12 +1680,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/cli-runtime v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/client-go v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2015,7 +2015,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-20230525151823-0001a21b5c48 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2035,14 +2035,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-20230525151823-0001a21b5c48 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/component-base v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2075,7 +2075,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/component-helpers v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2088,7 +2088,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/controller-manager v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2105,16 +2105,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-20230525151823-0001a21b5c48 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 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-20230525151823-0001a21b5c48 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 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-20230525151823-0001a21b5c48 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2133,11 +2133,11 @@ 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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2alpha1 -# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2168,7 +2168,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-20230525151823-0001a21b5c48 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 @@ -2201,13 +2201,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-20230525151823-0001a21b5c48 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/kubectl v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2243,7 +2243,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-20230525151823-0001a21b5c48 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2260,7 +2260,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.26.5 => github.com/openshift/kubernetes v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/kubernetes v1.26.5 => github.com/openshift/kubernetes v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3049,7 +3049,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-20230525151823-0001a21b5c48 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3092,7 +3092,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-20230525151823-0001a21b5c48 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3107,10 +3107,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-20230525151823-0001a21b5c48 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3253,33 +3253,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.4.1-0.20221214150008-e73634cb3870 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230531192419-7a891f05c7be +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230531192419-7a891f05c7be +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230531192419-7a891f05c7be From d68fa66423126cc7a9bec5f5ba4031a2389cd6b9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:09:58 +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 95f9aed23c..5be8dd8056 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.20230322155524-f70da9d78221 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525151823-0001a21b5c48 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230531192419-7a891f05c7be // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230531192419-7a891f05c7be // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index c2c9dd0b98..e5b1484aab 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -371,18 +371,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:Sjmgmr github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:oY9dmUpbeBrOE/0QAN0gL6Lz80E9J9KrXY1iz6a3ae8= github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 h1:6RjIiCa4GjAr/629mPuGYfXPl+GXTUCjtIN5yQY3zW0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48/go.mod h1:uLYjAyw1JyCS9EUj6oUhl4eRy4XthcFpSodl6cOokQI= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 h1:2Zmpi+EDBsILaXwDx+8JaWHcUzPixRqDxc4wf/H3aDw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48/go.mod h1:ApuQzVQOyTrgHIGrmVljD8zZ+ZoHmXYbsFwLvSelf84= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 h1:jwZDbCrZdVKjxsk+I+uXBuadEHTQOWAhgB7BI/DISUg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48/go.mod h1:LumLfFU84tK2qax1WpUviAosYlqlUaSJTIEtYjYpfxw= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 h1:W11kuy7UAV6PF6R67dNBKpbQ0UriFztleOPhK45SBew= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48/go.mod h1:0QH/+sNaHFjTGTSyuwBXuHHhyBRa2r6ndYXUxchMPKI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 h1:OBnNR17XY4dItGusmd90DFppjYEHibvUXKneVvffDHU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48/go.mod h1:4bzeXuIaKw5yabxEcNwxVYHKi0wLgcjl5naBxe4N1cw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 h1:MRXNxLQYVriLtgFXPibRh+p8RlZ9QqbyNbvkrKavtbA= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48/go.mod h1:plN+kBQozEYwSUD3aB9oFwrpkVeIN5xVpQ6sLRbSiNs= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be h1:0CAzgBFwA+FIoB1hEiKW/EAnWH/LV7CuBaNNexLHm2I= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be/go.mod h1:uLYjAyw1JyCS9EUj6oUhl4eRy4XthcFpSodl6cOokQI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be h1:C7yw98FMcRd7VSSqIb9/LwArIK32vh8BcY+HZ+HfXeY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be/go.mod h1:ApuQzVQOyTrgHIGrmVljD8zZ+ZoHmXYbsFwLvSelf84= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be h1:LwCCgwt1xZR9h+FwEY7kRnHxudqOqNGF+oleY7eDWAM= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be/go.mod h1:LumLfFU84tK2qax1WpUviAosYlqlUaSJTIEtYjYpfxw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be h1:NzaTuZR+DRilkvSyEb9ZWpXTtLDU5QPvS6+51mPGCZE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be/go.mod h1:0QH/+sNaHFjTGTSyuwBXuHHhyBRa2r6ndYXUxchMPKI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be h1:QSkvti9F0rhrUFx2VlnkV54Q/zQANciA3jkmj/hJYVE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be/go.mod h1:4bzeXuIaKw5yabxEcNwxVYHKi0wLgcjl5naBxe4N1cw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be h1:bp0l5Qqvu6/8G6/b7k6B+Eh2ENbzvoMdFr6B0VvNleQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be/go.mod h1:plN+kBQozEYwSUD3aB9oFwrpkVeIN5xVpQ6sLRbSiNs= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= 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 aacd6c201423506faafc39082b165b568ddcf191 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:10:02 +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 d488bbb991..9bbf5a1643 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -584,7 +584,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/api v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/apimachinery v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -687,12 +687,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/cli-runtime v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/client-go v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -835,7 +835,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/component-base v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -871,7 +871,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.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/kubectl v0.26.5 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be ## explicit; go 1.19 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -998,32 +998,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525151823-0001a21b5c48 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525151823-0001a21b5c48 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230531192419-7a891f05c7be +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230531192419-7a891f05c7be +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230531192419-7a891f05c7be +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230531192419-7a891f05c7be +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230531192419-7a891f05c7be +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230531192419-7a891f05c7be +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230531192419-7a891f05c7be +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230531192419-7a891f05c7be +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230531192419-7a891f05c7be +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230531192419-7a891f05c7be +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230531192419-7a891f05c7be +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230531192419-7a891f05c7be +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230531192419-7a891f05c7be +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230531192419-7a891f05c7be +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230531192419-7a891f05c7be +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230531192419-7a891f05c7be From 1fb80218aa3b3f183e886b841b64a6ff0a75ba9a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:10:02 +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 b2d66c6438..d146022312 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:4964f9b316ef38d1755f1a51287f9cbe290d3762525e003ac872a4506545186f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6f6b99a48f4a7012388772ec6d28021841484877e57925cfb46ad9fe7f2afb7" 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 3a9bcc5868..18d321e8eb 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:3a50d765747a6d13e9d901a752f6c194b796f72ae7a71f3afabe8fd5f0694d5e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad9810467f2b7ffc6362b5cdf89cc948381cd7f6a78be69cd7e5b64f98220e7a" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 71021a7d8f27e2f89e98c735dd4b15445c5a18c0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:10:03 +0000 Subject: [PATCH 8/9] update manifests --- assets/release/release-aarch64.json | 6 +++--- assets/release/release-x86_64.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 0cc001ac55..6d1c4ba167 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-05-31-230630" + "base": "4.13.0-0.nightly-arm64-2023-06-03-192022" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:321eab948b72a9c18b65d8521d624aaf2fbf1004b5f919e5ac91c4ff812573fd", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:735f70c9a041a4a960723c847debee91b3ca95050f00d651c723f4c37f4666af", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:011ab195a192346c1af6012deff8651ffc51e293559d5ac99ee0f6a93a5976f4", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d55d026aaa5cf82c2d292fce43f3feb20b51a6cf92aaebf02f518325d7856e82", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c95a513fea425ceb0cae260310d68973b8a78f9ebdf29e9547d8150eed174ba", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:264a1f06d6b92dcbe73d07fa71fcdca40aec9e01f52cb35e0614948fac03a9c3", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a50d765747a6d13e9d901a752f6c194b796f72ae7a71f3afabe8fd5f0694d5e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad9810467f2b7ffc6362b5cdf89cc948381cd7f6a78be69cd7e5b64f98220e7a", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d014970b365f388a53a81245ac0c7ce3d9aa4807e6cececa3486fc53638daac9", "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 e523b2c487..69051b61ea 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.13.0-0.nightly-2023-06-01-050820" + "base": "4.13.0-0.nightly-2023-06-03-192019" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73df37794ffff7de1101016c23dc623e4990810390ebdabcbbfa065214352c7c", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a53b9de5f1ebf995a053f9ea36126339fe0c943cd8bfedf9f197c4f5b4356d70", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6887eeea92da94a928ed5d4079767c7a821406ef4742ae96822e967f3d62a9cb", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2572af11342785cfe626632c098e6dadd7417cebceb1e14e8482b1f7c8ae3bb8", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2c996db015285504e1203f33beb5385e9efbe93c34cc4ea69bab6fe5f9df0e4", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc4532552cb43368eca38f79f84f020e28e75df1397d488815ba3110fefc90f4", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4964f9b316ef38d1755f1a51287f9cbe290d3762525e003ac872a4506545186f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6f6b99a48f4a7012388772ec6d28021841484877e57925cfb46ad9fe7f2afb7", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53bb5a14c1d634a465b2a87e88a5746a808837d0e36f0c45dedd0a838ffd2f65", "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 6e32c899a5a656b245c8ae0eecc966e44a5a453e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:10:05 +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 d9f3a52929..61be047c3a 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=26 KUBE_GIT_VERSION=v1.26.4 -KUBE_GIT_COMMIT=0001a21b5c48ec2befb79e06949a0db8120ea413 +KUBE_GIT_COMMIT=7a891f05c7beb9527024c7616d95f6ff5c309f27 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 1b92ac3713..dafabf6a4d 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-31-230630 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-03-192022 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index bb9fa3b2a1..9a71224116 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-06-01-050820 +OCP_VERSION := 4.13.0-0.nightly-2023-06-03-192019