From c22eeab325dc9dcf40c196a03959c4d17ff69701 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:12:41 +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 a874d2d836..29b5eec574 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-03-08-194110" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-03-14-010802" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-03-20-201450" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-03-20-191904" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 6e6a68063c6770d7fdc27c5bff44996b581c1392 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:12:42 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 356 +++++------------------------- scripts/auto-rebase/commits.txt | 24 +- 2 files changed, 74 insertions(+), 306 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 49ed4e5207..cbf78270ea 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,309 +1,75 @@ -- cluster-dns-operator embedded-component ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b to d96022a4d0d091955d73e7e99fc8cc81db56c86a - - 195cabc 2023-02-01T16:13:26-05:00 update-node-resolver.sh: Check for errors from >> +- cluster-kube-apiserver-operator embedded-component 6ad0a9407be5d5229d605665986899be4b531b5e to ef8bdac3cfe79a108d2caaf6a5f7db261aad3fe8 + - 29cf56c 2023-03-08T16:34:13+01:00 *: add encryption tests for aesgcm provider + - 8b6ce4d 2023-03-08T16:34:11+01:00 bump(library-go,build-machinery-go) + - 009ec66 2023-03-07T13:06:30+01:00 Disable TestBoundTokenSignerController -- cluster-ingress-operator embedded-component 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d to a29464eda9614ac3d70c185b572f4839195e7306 - - 66defd0 2023-01-30T15:04:04-05:00 NE-1185: Test_desiredHttpErrorCodeConfigMap: Fix format - - f7bfa89 2023-01-27T15:27:44-05:00 NE-1186: Test_getRR: Fix typo: "excepted" → "expected" - - 5781345 2023-01-27T15:21:19-05:00 NE-1184: Test_desiredHttpErrorCodeConfigMap: Kill dead code - - 25eee8e 2022-11-23T09:13:37-06:00 configurable-route: Don't use NewKindWithCache +- cluster-kube-controller-manager-operator embedded-component f882f66700ce0c88073a6af79d1a8adcd59f721f to d28c67af6498a1859a30c7ebe75bd4abaf72a71c + - 7201ba8 2023-03-08T15:48:29+00:00 Update library-go dependency to move Azure to out of tree -- cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 to f882f66700ce0c88073a6af79d1a8adcd59f721f - - 35fec29 2023-03-07T11:58:46+00:00 Update library-go dependency to move AWS to out of tree +- cluster-network-operator embedded-component 6252ae9fcb162cdac1a4284f65d3406fa7192736 to 5ebd764b5747784a79bb1bcf39b0fc9a1a747f13 + - be095d8 2023-03-09T14:49:20-05:00 Whereabouts should implement the reconciliation controller + - dfa5216 2023-03-09T09:09:10-05:00 [WIP] Point libreswan to proper nss location + - b3539db 2023-03-09T11:41:21+01:00 HyperShift: Set priority class for CNCC + - f4d0a3a 2023-03-09T11:41:21+01:00 HyperShift: Adapt affinity and tolerations + - 9cdd186 2023-03-09T11:41:20+01:00 HyperShift: Co-locate CNCC and multus admission controller with other hcp pods + - b54238b 2023-03-07T12:36:29-08:00 pin k8s.io/apimachinery for 1.26_rebase + - de9bf25 2023-03-07T12:35:46-08:00 Fix kube-proxy related breakages for 1.26 rebase + - 6f862db 2023-03-07T12:32:30-08:00 unpin konnectivity-client and cluster-api for 1.26_rebase + - e2e3b02 2023-03-07T12:27:36-08:00 update go from 1.18 to 1.19 for 1.26_rebase + - 2a3e9ed 2023-03-07T12:26:10-08:00 go get/tidy/vendor for 1.26_rebase + - 48250a6 2023-03-07T15:20:00-05:00 use annotation daemonset to update hybrid overlay + - f185b94 2023-03-07T10:32:30-08:00 add/update some UTs around clusternetwork change + - 4e756a1 2023-03-07T18:49:06+01:00 Set healthz-bind-address to 0.0.0.0:10256 for ovnk + - 00148b2 2023-03-06T19:32:49+01:00 Pass POD_NAME to ovnkube node for node healthz server checks + - 9c3be94 2022-12-16T11:30:50+00:00 Set north/south bound stale alerts to critical -- cluster-network-operator embedded-component 4d5a093d41e45def540ffbe4c5dc214550864d53 to 6252ae9fcb162cdac1a4284f65d3406fa7192736 - - d0c1518 2023-03-02T10:09:15-08:00 Add UTs around expanding clusternetwork CIDR mask - - 5ea7d91 2023-03-02T10:09:15-08:00 refactor out tests from larger TestIsChangeSafe() - - 9d1ccf7 2023-03-02T10:09:14-08:00 allow for expanding clusterNetwork CIDR mask - - d91d378 2023-03-01T10:28:00-05:00 Enables nodeSelector to be used in egress firewall rule - - 6da6384 2023-03-01T13:31:22+00:00 OVN IC: migrate subnet alloc alerts to cluster manager - - 56a5c7e 2023-02-28T13:51:27+00:00 OVN-K alerts: add OVS overflow alerts - - 851a251 2023-02-23T16:03:58+01:00 Add ovnk alert for resource retry failure - - 3a76d93 2023-02-10T18:41:46-06:00 ovn-kubernetes: use RHEL9-based images - - 6adb50c 2023-02-10T08:36:26-08:00 Remove the ovn-kind-cno.sh script +- etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd to 384dc49aed5ecac0b9772bf07cee3e4ee85e1d8b + - 5a3084a2 2023-03-10T05:06:00+00:00 Updating ose-etcd images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/ose-etcd.yml -- kubernetes embedded-component 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 3754ece77dda848d508b37369a1f2646faaeae13 - - 89af6258d 2023-03-06T14:53:42+01:00 UPSTREAM: : update rebase doc - - ed2f3d8a8 2023-03-02T10:11:42-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 316215ca1 2023-03-02T10:11:41-05:00 UPSTREAM: : kubelet: fix readiness probes with pod termination - - 0655647e6 2023-03-02T09:01:03-05:00 UPSTREAM: : manually resolve conflicts - - 5bb8838b4 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators - - d405dc93f 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces - - 9626fc26a 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller - - fc04e732b 2023-02-22T13:32:21+00:00 Release commit for Kubernetes v1.26.2 - - 22d484661 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 40eb36a15 2023-02-16T14:11:41+01:00 releng: Update images, dependencies and version to Go 1.19.6 - - 26d4675e1 2023-02-14T23:18:23-05:00 Update golang.org/x/net to v0.7.0 - - c5fe6226c 2023-02-08T18:06:10-08:00 Pin golang.org/x/net to v0.4.0 in 1.26 - - 4e95e99f0 2023-02-08T16:20:15-08:00 Enforce nodeName cannot be set along with non empty schedulingGates - - be1dc7d5c 2023-02-08T13:56:28+05:30 *: Fix linter warnings - - 07ee81cf8 2023-02-08T11:41:27+05:30 hack/tools: Bump golangci-lint version - - c651e4f7d 2023-02-06T20:38:48-05:00 kubelet/client: collapse transport wiring onto standard approach - - 5a6e365e1 2023-02-06T17:37:22+00:00 Ignore container events with nil PodSandboxStatus - - 6d4db15bf 2023-02-02T11:51:58-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler - - a082cbd23 2023-02-01T23:16:53+00:00 update prev succeeded indexes for indexed jobs unconditionally - - b10dce49c 2023-01-30T15:37:01+01:00 dynamic resource allocation: avoid apiserver complaint about list content - - 15b48cd3a 2023-01-29T19:55:51-05:00 Avoid typechecking stdlib - - a9edc2c21 2023-01-27T12:40:09-08:00 Fix konnectivity-client metric registration. - - aa950773c 2023-01-26T21:52:53+00:00 Fix nil pointer error in nodevolumelimits csi logging - - d3b0f3f7d 2023-01-26T21:28:41+00:00 add scale test for probes - - 7d2254d97 2023-01-26T10:51:24-03:00 kubectl: use v2 for hpa - - 4cd96e614 2023-01-26T11:21:49+00:00 Fix panic on ClusterIP allocation for /28 subnets - - b6429e3d3 2023-01-23T21:28:03+00:00 use custom dialer for http probes - - cc7e738f5 2023-01-23T21:28:03+00:00 use custom dialer for tcp probes - - b48139c65 2023-01-23T21:28:03+00:00 add custom dialer optimized for probes - - 5dc78931f 2023-01-20T15:31:56+01:00 k8s.io/component-base/logs: match full help text in unit test - - 576b56a58 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: relax flagset unit tests - - ce665b2a6 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: unit test for command line help output - - 6495dd02e 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: fix usage through Go flag package - - 0b0a325bb 2023-01-18T14:52:17-08:00 fix bug with param controllers being removed if used by more than one policy - - 7ec8de509 2023-01-18T12:03:18-05:00 Fix shadowing lint error - - 8f86f5739 2023-01-18T12:03:15-05:00 bump honnef.co/go/tools to support go1.20 - - 070518c50 2023-01-18T16:50:15+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1 - - 8017dfff6 2023-01-18T15:51:25+00:00 Release commit for Kubernetes v1.26.2-rc.0 - - 8f94681cd 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 - - 0248aa84d 2023-01-17T20:03:15-08:00 Fixes the issue #114145 - - 0f05e2622 2023-01-16T11:14:49+01:00 PodGC should not add DisruptionTarget condition for pods which are in terminal phase - - fd2245b84 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff - - fcc4ed670 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 - - d23d4afdc 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message - - 242b82c86 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method - - 0085f2537 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions - - 424b877bd 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo - - 5b7b94932 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events - - 707031462 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata - - 91228a574 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. - - 57cea1f4d 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources - - 529e773d9 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 - - fc27c43db 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 - - c25004b88 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md - - bfda7f636 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails - - 640f15b87 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods - - da22a8fd2 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage - - cceaf6c3a 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller - - b897fb4fa 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 - - a5c0a5f04 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version - - 5e22175b1 2022-12-20T22:08:34+00:00 Resource claims should be a map type - - 0b0eee5cc 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. - - cbeb5809b 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins - - bbb5513b3 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars - - 674db5228 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails - - de757c46a 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests - - 180e7dbbd 2022-12-13T11:16:35-05:00 Reduce load of Job integration test - - e5539672b 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 - - a3c81d8b4 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly - - f8b99b1f0 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs - - 5108c2dde 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 - - 4c5225033 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 - - a9241b145 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP - - 40f01d0c8 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies +- kubernetes embedded-component 3754ece77dda848d508b37369a1f2646faaeae13 to 54b552033300ab1f94ddf8a9d16032e6619556da + - 20caad91a 2023-03-17T08:24:13-04:00 UPSTREAM: 115328: annotate early and late requests + - 310f2c558 2023-03-14T09:48:14-06:00 UPSTREAM: : STOR-829: Add CSIInlineVolumeSecurity admission plugin + - 209a35030 2023-03-03T12:36:32-05:00 UPSTREAM: 116227: Fix mounted volume expansion tests + - 85f0f2ce7 2023-02-17T16:50:00-05:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" + +- machine-config-operator embedded-component 832de9edfdc4cc980899550c008bd8d56664f154 to 238cb899decd327fdbc68c04d28cf098d0edf827 + - aab2c5eb 2023-03-14T07:48:43-04:00 daemon: Drop duplicate `--authfile` used in `run` + - c8c299c2 2023-03-10T15:52:29+01:00 Remove hard requirement for the afterburn from early-running aws-related services + - 1440c413 2023-03-09T14:55:54-05:00 daemon: Only switchkernel if we are doing an OS update or kernel change + - 112277e3 2023-03-09T11:03:56-05:00 daemon: Always remove pending deployment before we do updates + - 22b7e83b 2023-03-09T11:03:05-05:00 daemon: Move cleanup of pending deployment earlier + - cb2958d4 2023-03-08T19:31:23-06:00 Dockerfile: Fix removing extensions for fcos/scos + - e68a59f5 2023-03-05T10:16:06-05:00 e2e: add testing for cert rotation + - 28343237 2023-03-05T10:16:06-05:00 Remove paused pool kubelet ca alert metrics + - 643a6d69 2023-03-05T10:16:06-05:00 server: add path to also serve the latest kubelet ca + - 636ab6f9 2023-03-05T10:16:02-05:00 daemon: have a special path to sync in certs + - de00acb3 2023-02-13T14:26:25-08:00 Removing jstuever from OWNERS_ALIASES -- machine-config-operator embedded-component c078cdd2614e409faf0e9b13d97c426c065a71da to 832de9edfdc4cc980899550c008bd8d56664f154 - - b7a58877 2023-03-08T12:05:11-05:00 openshift-azure-routes: Avoid synchronizing too quickly - - a0e77c24 2023-03-08T12:05:11-05:00 daemon: Also override `kernel-modules-core` - - 44f9ad58 2023-03-08T12:04:28-05:00 Switch to rhel-coreos (9) - - 14d30fe5 2023-03-08T10:43:21-05:00 checks perms for SSH key path dirs as well - - 9412f1dd 2023-03-08T10:43:21-05:00 teaches TestIgn3Cfg about the new RHCOS 9 key path - - bfb9d775 2023-03-08T10:43:21-05:00 ensures SSH keys get moved to the correct location - - fc98d02a 2023-03-08T10:43:21-05:00 OKD release controller is out-of-date - - 4c212efe 2023-03-08T10:43:21-05:00 ensures that RHCOS 9 SSH keys are in the right place - - 8ac5beed 2023-03-08T08:48:37-05:00 daemon: Make switchKernel less stateful - - cae67a64 2023-03-08T08:48:35-05:00 vendor: Bump coreos/rpm-ostree-client-go - - b75c7afd 2023-03-08T08:36:43-05:00 daemon: Clean up `switchKernel` a bit - - cee9e699 2023-03-07T20:37:04+01:00 Revert "daemon: Temporarily copy auth file with more open perms on FCOS" - - 4b96a9a4 2023-03-07T17:16:35+00:00 Update generated clients - - f0a908bf 2023-03-07T17:03:15+00:00 Update render test for AWS out of tree - - 228eccd0 2023-03-07T17:03:14+00:00 Update library go to promote AWS CCM to out of tree - - 9034e992 2023-03-07T08:01:51-05:00 daemon: Remove noisy log message - - 3e98b093 2023-03-04T02:22:49+05:30 Fix minor issues - - 73ff1030 2023-03-03T19:39:52+01:00 OCPBUGS-5872: Wrap podman commands in a while loop - - 97d751fe 2023-03-03T10:43:11-05:00 daemon: state metrics will clear old values when updated - - a72fada7 2023-03-03T05:52:23+05:30 Default the cgroup version to "v1" via base template controller - - 3234b724 2023-02-28T12:50:31-06:00 OPNET-208: Prefer ipv6 on v6-primary dual stack deployments - - 626a3369 2023-02-27T20:32:46+02:00 Fixing platform path order as platform specific path should be the last - - d8c07ceb 2023-02-27T11:10:49+00:00 configure-ovs: permanent retry on failure - - 865c4148 2023-02-23T14:49:28-05:00 daemon: Added no-op sync while waiting on node reboot - - 45999314 2023-02-23T13:00:15-05:00 Add back cleanupDuplicateMC - - 69c98ccb 2023-02-21T16:56:41-06:00 added e2e testing to ensure password is updated and confirmed - - de59bd28 2023-02-17T10:39:47-06:00 set passwordhash enabled, udpated verifyUserFields, reworded comments - - 18a6b3a1 2022-10-17T14:04:51-04:00 machineconfigpool: Clarify `status.configuration` description +- oc image-amd64 04577c4f1055f69421d9b1ff6c15bd7257674324 to 07ee29c0df5c8d234feadfce0bfb86970ce45336 + - 887d9d2 2023-03-09T09:55:01+03:00 Add microshift into generate-docs -- openshift-controller-manager embedded-component 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a to 87de83867ac51730f506138ee790a56ca21d9fc9 - - a9be557 2023-01-19T11:41:05-05:00 Add explicit license +- router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to d35eab518fb332b19a75a51a92c19971e61e4f20 + - d61da27 2023-03-16T17:04:53-04:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" -- service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a to 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c - - 80c0742 2023-03-05T15:02:56+02:00 API-1525: Add openshift_service-ca namespace yaml to manifests dir When installing SNO openshift-service-ca service-ca pod takes a few minutes to start. Creating the serivce-ca namespace early allows it to get openshift.io/sa.scc.uid-range annotation and start running earlier. +- ovn-kubernetes image-amd64 Script exited with error. to 5cfa88c4b777819b8f89d3dc16ca5a703a7116f0 +There was an error determining the changes -- oc image-amd64 83fd126d7c7c598b1bfa398641d330e24596c2cf to 04577c4f1055f69421d9b1ff6c15bd7257674324 - - fe31e03 2023-02-28T15:53:55+01:00 Microshift command docs - - 39679d5 2023-02-27T15:13:52+01:00 groupsync: cache ldap connection instead of spamming the LDAP server with conn/bind - - adce7ba 2023-02-27T15:13:52+01:00 bump(library-go): update to LDAP queries library - - 3863b46 2023-02-22T14:09:28+03:00 Add subrepository support for ICSP - - b186341 2023-02-21T11:07:44+01:00 Do not set master node selector if there's no masters -- kubernetes image-amd64 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 3754ece77dda848d508b37369a1f2646faaeae13 - - 89af6258d 2023-03-06T14:53:42+01:00 UPSTREAM: : update rebase doc - - ed2f3d8a8 2023-03-02T10:11:42-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 316215ca1 2023-03-02T10:11:41-05:00 UPSTREAM: : kubelet: fix readiness probes with pod termination - - 0655647e6 2023-03-02T09:01:03-05:00 UPSTREAM: : manually resolve conflicts - - 5bb8838b4 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators - - d405dc93f 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces - - 9626fc26a 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller - - fc04e732b 2023-02-22T13:32:21+00:00 Release commit for Kubernetes v1.26.2 - - 22d484661 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 40eb36a15 2023-02-16T14:11:41+01:00 releng: Update images, dependencies and version to Go 1.19.6 - - 26d4675e1 2023-02-14T23:18:23-05:00 Update golang.org/x/net to v0.7.0 - - c5fe6226c 2023-02-08T18:06:10-08:00 Pin golang.org/x/net to v0.4.0 in 1.26 - - 4e95e99f0 2023-02-08T16:20:15-08:00 Enforce nodeName cannot be set along with non empty schedulingGates - - be1dc7d5c 2023-02-08T13:56:28+05:30 *: Fix linter warnings - - 07ee81cf8 2023-02-08T11:41:27+05:30 hack/tools: Bump golangci-lint version - - c651e4f7d 2023-02-06T20:38:48-05:00 kubelet/client: collapse transport wiring onto standard approach - - 5a6e365e1 2023-02-06T17:37:22+00:00 Ignore container events with nil PodSandboxStatus - - 6d4db15bf 2023-02-02T11:51:58-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler - - a082cbd23 2023-02-01T23:16:53+00:00 update prev succeeded indexes for indexed jobs unconditionally - - b10dce49c 2023-01-30T15:37:01+01:00 dynamic resource allocation: avoid apiserver complaint about list content - - 15b48cd3a 2023-01-29T19:55:51-05:00 Avoid typechecking stdlib - - a9edc2c21 2023-01-27T12:40:09-08:00 Fix konnectivity-client metric registration. - - aa950773c 2023-01-26T21:52:53+00:00 Fix nil pointer error in nodevolumelimits csi logging - - d3b0f3f7d 2023-01-26T21:28:41+00:00 add scale test for probes - - 7d2254d97 2023-01-26T10:51:24-03:00 kubectl: use v2 for hpa - - 4cd96e614 2023-01-26T11:21:49+00:00 Fix panic on ClusterIP allocation for /28 subnets - - b6429e3d3 2023-01-23T21:28:03+00:00 use custom dialer for http probes - - cc7e738f5 2023-01-23T21:28:03+00:00 use custom dialer for tcp probes - - b48139c65 2023-01-23T21:28:03+00:00 add custom dialer optimized for probes - - 5dc78931f 2023-01-20T15:31:56+01:00 k8s.io/component-base/logs: match full help text in unit test - - 576b56a58 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: relax flagset unit tests - - ce665b2a6 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: unit test for command line help output - - 6495dd02e 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: fix usage through Go flag package - - 0b0a325bb 2023-01-18T14:52:17-08:00 fix bug with param controllers being removed if used by more than one policy - - 7ec8de509 2023-01-18T12:03:18-05:00 Fix shadowing lint error - - 8f86f5739 2023-01-18T12:03:15-05:00 bump honnef.co/go/tools to support go1.20 - - 070518c50 2023-01-18T16:50:15+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1 - - 8017dfff6 2023-01-18T15:51:25+00:00 Release commit for Kubernetes v1.26.2-rc.0 - - 8f94681cd 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 - - 0248aa84d 2023-01-17T20:03:15-08:00 Fixes the issue #114145 - - 0f05e2622 2023-01-16T11:14:49+01:00 PodGC should not add DisruptionTarget condition for pods which are in terminal phase - - fd2245b84 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff - - fcc4ed670 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 - - d23d4afdc 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message - - 242b82c86 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method - - 0085f2537 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions - - 424b877bd 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo - - 5b7b94932 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events - - 707031462 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata - - 91228a574 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. - - 57cea1f4d 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources - - 529e773d9 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 - - fc27c43db 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 - - c25004b88 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md - - bfda7f636 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails - - 640f15b87 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods - - da22a8fd2 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage - - cceaf6c3a 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller - - b897fb4fa 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 - - a5c0a5f04 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version - - 5e22175b1 2022-12-20T22:08:34+00:00 Resource claims should be a map type - - 0b0eee5cc 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. - - cbeb5809b 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins - - bbb5513b3 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars - - 674db5228 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails - - de757c46a 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests - - 180e7dbbd 2022-12-13T11:16:35-05:00 Reduce load of Job integration test - - e5539672b 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 - - a3c81d8b4 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly - - f8b99b1f0 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs - - 5108c2dde 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 - - 4c5225033 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 - - a9241b145 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP - - 40f01d0c8 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies +- kubernetes image-amd64 3754ece77dda848d508b37369a1f2646faaeae13 to 54b552033300ab1f94ddf8a9d16032e6619556da + - 20caad91a 2023-03-17T08:24:13-04:00 UPSTREAM: 115328: annotate early and late requests + - 310f2c558 2023-03-14T09:48:14-06:00 UPSTREAM: : STOR-829: Add CSIInlineVolumeSecurity admission plugin + - 209a35030 2023-03-03T12:36:32-05:00 UPSTREAM: 116227: Fix mounted volume expansion tests + - 85f0f2ce7 2023-02-17T16:50:00-05:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" -- service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a to 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c - - 80c0742 2023-03-05T15:02:56+02:00 API-1525: Add openshift_service-ca namespace yaml to manifests dir When installing SNO openshift-service-ca service-ca pod takes a few minutes to start. Creating the serivce-ca namespace early allows it to get openshift.io/sa.scc.uid-range annotation and start running earlier. +- router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to d35eab518fb332b19a75a51a92c19971e61e4f20 + - d61da27 2023-03-16T17:04:53-04:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" -- oc image-arm64 83fd126d7c7c598b1bfa398641d330e24596c2cf to 07ee29c0df5c8d234feadfce0bfb86970ce45336 - - 887d9d2 2023-03-09T09:55:01+03:00 Add microshift into generate-docs - - fe31e03 2023-02-28T15:53:55+01:00 Microshift command docs - - 39679d5 2023-02-27T15:13:52+01:00 groupsync: cache ldap connection instead of spamming the LDAP server with conn/bind - - adce7ba 2023-02-27T15:13:52+01:00 bump(library-go): update to LDAP queries library - - 3863b46 2023-02-22T14:09:28+03:00 Add subrepository support for ICSP - - b186341 2023-02-21T11:07:44+01:00 Do not set master node selector if there's no masters +- ovn-kubernetes image-arm64 Script exited with error. to 5cfa88c4b777819b8f89d3dc16ca5a703a7116f0 +There was an error determining the changes -- kubernetes image-arm64 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 7d98b1aa513462643491f4ddc6607d523a896788 - - 89af6258d 2023-03-06T14:53:42+01:00 UPSTREAM: : update rebase doc - - 209a35030 2023-03-03T12:36:32-05:00 UPSTREAM: 116227: Fix mounted volume expansion tests - - ed2f3d8a8 2023-03-02T10:11:42-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 316215ca1 2023-03-02T10:11:41-05:00 UPSTREAM: : kubelet: fix readiness probes with pod termination - - 0655647e6 2023-03-02T09:01:03-05:00 UPSTREAM: : manually resolve conflicts - - 5bb8838b4 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators - - d405dc93f 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces - - 9626fc26a 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller - - fc04e732b 2023-02-22T13:32:21+00:00 Release commit for Kubernetes v1.26.2 - - 22d484661 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 40eb36a15 2023-02-16T14:11:41+01:00 releng: Update images, dependencies and version to Go 1.19.6 - - 26d4675e1 2023-02-14T23:18:23-05:00 Update golang.org/x/net to v0.7.0 - - c5fe6226c 2023-02-08T18:06:10-08:00 Pin golang.org/x/net to v0.4.0 in 1.26 - - 4e95e99f0 2023-02-08T16:20:15-08:00 Enforce nodeName cannot be set along with non empty schedulingGates - - be1dc7d5c 2023-02-08T13:56:28+05:30 *: Fix linter warnings - - 07ee81cf8 2023-02-08T11:41:27+05:30 hack/tools: Bump golangci-lint version - - c651e4f7d 2023-02-06T20:38:48-05:00 kubelet/client: collapse transport wiring onto standard approach - - 5a6e365e1 2023-02-06T17:37:22+00:00 Ignore container events with nil PodSandboxStatus - - 6d4db15bf 2023-02-02T11:51:58-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler - - a082cbd23 2023-02-01T23:16:53+00:00 update prev succeeded indexes for indexed jobs unconditionally - - b10dce49c 2023-01-30T15:37:01+01:00 dynamic resource allocation: avoid apiserver complaint about list content - - 15b48cd3a 2023-01-29T19:55:51-05:00 Avoid typechecking stdlib - - a9edc2c21 2023-01-27T12:40:09-08:00 Fix konnectivity-client metric registration. - - aa950773c 2023-01-26T21:52:53+00:00 Fix nil pointer error in nodevolumelimits csi logging - - d3b0f3f7d 2023-01-26T21:28:41+00:00 add scale test for probes - - 7d2254d97 2023-01-26T10:51:24-03:00 kubectl: use v2 for hpa - - 4cd96e614 2023-01-26T11:21:49+00:00 Fix panic on ClusterIP allocation for /28 subnets - - b6429e3d3 2023-01-23T21:28:03+00:00 use custom dialer for http probes - - cc7e738f5 2023-01-23T21:28:03+00:00 use custom dialer for tcp probes - - b48139c65 2023-01-23T21:28:03+00:00 add custom dialer optimized for probes - - 5dc78931f 2023-01-20T15:31:56+01:00 k8s.io/component-base/logs: match full help text in unit test - - 576b56a58 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: relax flagset unit tests - - ce665b2a6 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: unit test for command line help output - - 6495dd02e 2023-01-20T15:30:36+01:00 k8s.io/component-base/logs: fix usage through Go flag package - - 0b0a325bb 2023-01-18T14:52:17-08:00 fix bug with param controllers being removed if used by more than one policy - - 7ec8de509 2023-01-18T12:03:18-05:00 Fix shadowing lint error - - 8f86f5739 2023-01-18T12:03:15-05:00 bump honnef.co/go/tools to support go1.20 - - 070518c50 2023-01-18T16:50:15+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1 - - 8017dfff6 2023-01-18T15:51:25+00:00 Release commit for Kubernetes v1.26.2-rc.0 - - 8f94681cd 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 - - 0248aa84d 2023-01-17T20:03:15-08:00 Fixes the issue #114145 - - 0f05e2622 2023-01-16T11:14:49+01:00 PodGC should not add DisruptionTarget condition for pods which are in terminal phase - - fd2245b84 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff - - fcc4ed670 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 - - d23d4afdc 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message - - 242b82c86 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method - - 0085f2537 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions - - 424b877bd 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo - - 5b7b94932 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events - - 707031462 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata - - 91228a574 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. - - 57cea1f4d 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources - - 529e773d9 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 - - fc27c43db 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 - - c25004b88 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md - - bfda7f636 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails - - 640f15b87 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods - - da22a8fd2 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage - - cceaf6c3a 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller - - b897fb4fa 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 - - a5c0a5f04 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version - - 5e22175b1 2022-12-20T22:08:34+00:00 Resource claims should be a map type - - 0b0eee5cc 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. - - cbeb5809b 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins - - bbb5513b3 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars - - 674db5228 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails - - de757c46a 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests - - 180e7dbbd 2022-12-13T11:16:35-05:00 Reduce load of Job integration test - - e5539672b 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 - - a3c81d8b4 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly - - f8b99b1f0 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs - - 5108c2dde 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 - - 4c5225033 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 - - a9241b145 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP - - 40f01d0c8 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies -- service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a to 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c - - 80c0742 2023-03-05T15:02:56+02:00 API-1525: Add openshift_service-ca namespace yaml to manifests dir When installing SNO openshift-service-ca service-ca pod takes a few minutes to start. Creating the serivce-ca namespace early allows it to get openshift.io/sa.scc.uid-range annotation and start running earlier. +- kubernetes image-arm64 7d98b1aa513462643491f4ddc6607d523a896788 to 54b552033300ab1f94ddf8a9d16032e6619556da + - 20caad91a 2023-03-17T08:24:13-04:00 UPSTREAM: 115328: annotate early and late requests + - 310f2c558 2023-03-14T09:48:14-06:00 UPSTREAM: : STOR-829: Add CSIInlineVolumeSecurity admission plugin + - 85f0f2ce7 2023-02-17T16:50:00-05:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ee58c920ac..7ede4d39f0 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,26 +1,28 @@ https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a https://github.com/openshift/cluster-ingress-operator embedded-component a29464eda9614ac3d70c185b572f4839195e7306 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 6ad0a9407be5d5229d605665986899be4b531b5e -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component f882f66700ce0c88073a6af79d1a8adcd59f721f +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component ef8bdac3cfe79a108d2caaf6a5f7db261aad3fe8 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component d28c67af6498a1859a30c7ebe75bd4abaf72a71c https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 -https://github.com/openshift/cluster-network-operator embedded-component 6252ae9fcb162cdac1a4284f65d3406fa7192736 +https://github.com/openshift/cluster-network-operator embedded-component 5ebd764b5747784a79bb1bcf39b0fc9a1a747f13 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 -https://github.com/openshift/etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd -https://github.com/openshift/kubernetes embedded-component 3754ece77dda848d508b37369a1f2646faaeae13 -https://github.com/openshift/machine-config-operator embedded-component 832de9edfdc4cc980899550c008bd8d56664f154 +https://github.com/openshift/etcd embedded-component 384dc49aed5ecac0b9772bf07cee3e4ee85e1d8b +https://github.com/openshift/kubernetes embedded-component 54b552033300ab1f94ddf8a9d16032e6619556da +https://github.com/openshift/machine-config-operator embedded-component 238cb899decd327fdbc68c04d28cf098d0edf827 https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9 https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 https://github.com/openshift/service-ca-operator embedded-component 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c -https://github.com/openshift/oc image-amd64 04577c4f1055f69421d9b1ff6c15bd7257674324 +https://github.com/openshift/oc image-amd64 07ee29c0df5c8d234feadfce0bfb86970ce45336 https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 +https://github.com/openshift/router image-amd64 d35eab518fb332b19a75a51a92c19971e61e4f20 https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/kubernetes image-amd64 3754ece77dda848d508b37369a1f2646faaeae13 +https://github.com/openshift/ovn-kubernetes image-amd64 5cfa88c4b777819b8f89d3dc16ca5a703a7116f0 +https://github.com/openshift/kubernetes image-amd64 54b552033300ab1f94ddf8a9d16032e6619556da https://github.com/openshift/service-ca-operator image-amd64 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c https://github.com/openshift/oc image-arm64 07ee29c0df5c8d234feadfce0bfb86970ce45336 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 +https://github.com/openshift/router image-arm64 d35eab518fb332b19a75a51a92c19971e61e4f20 https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/kubernetes image-arm64 7d98b1aa513462643491f4ddc6607d523a896788 +https://github.com/openshift/ovn-kubernetes image-arm64 5cfa88c4b777819b8f89d3dc16ca5a703a7116f0 +https://github.com/openshift/kubernetes image-arm64 54b552033300ab1f94ddf8a9d16032e6619556da https://github.com/openshift/service-ca-operator image-arm64 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c From 470a91abeb378492d48dd105b73f3baf5f9eb25d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:10 +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 f73bb1272a..19a2cea8e9 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-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230306172737-3754ece77dda // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230306172737-3754ece77dda // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230317230219-54b552033300 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230317230219-54b552033300 // from kubernetes ) diff --git a/go.sum b/go.sum index 0a1a93340c..8db24e0fa1 100644 --- a/go.sum +++ b/go.sum @@ -608,57 +608,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-20230217170320-ac01e3463245 h1:BoNt9Hemwyc32xX+CZZaNGegWEiN7bGTVk4XaRboO8k= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230306172737-3754ece77dda h1:3fzfpwp+mrCKcB7PcFCGPnkmC0XSdaBXlwbTZPi9qfU= -github.com/openshift/kubernetes v0.0.0-20230306172737-3754ece77dda/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda h1:6kfaDiGwUbHa1Ow05SXNS0E4MbVUSzG2dA2km+PY3JM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda h1:WPGtEk8gWkg7pMO3Z3hky4vQKcL5B0Rs5h3p/BQluyY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda/go.mod h1:U0Mmzj5eyc8IBdGjsF2XR3dBQG0yqvhy468GKZvdfXU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda h1:8Cwr2khjukggvuYqNv3jFqRsIVA4qPQqMQwmA9n9w/0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda h1:rHG/U8RiPzsZk1wcJwRymSbzhYFIPrVbxRDXRX0r0lQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda/go.mod h1:xwqK7Ox7oH/b11ZMPYtqPV/OYt2ZlYZf7XsuukECSc4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda h1:4uXMRgHzI6Sqga3ZfrWjIkQgGAEI9QZDP9x0ploLRVs= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda h1:Y1fPbnj15DQrh4xjT8UmsMIPH83UKxnJKZhX8m+7vCk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda h1:IwY7jFDCwA4OhZAHeMDe28Js4l9zFH5d4u5IG7mI0LA= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda/go.mod h1:C8LxhCSrMIvk2892MFXHd6Ygyy/cCVK30VOZZVm4KSM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda h1:/nYgIqRP6bJd/eXEc8eIxFO0kBiiAdQkayTCJhfARpo= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda/go.mod h1:sf8VADmgVR2MzucAzvUaYsYLUi8S4onGjDNXWp6+iOw= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230306172737-3754ece77dda/go.mod h1:HDEVJ4fMSa8PKXQ5cJgG2PEEYCM9NDxpj7EojkpHatA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda h1:tkwDZgUx2iYk5w/cNYRz/ofr8OX6986+C0Rd4ny0QZ0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda h1:pLrZdt0TA94kfgPL+2oRK1rVfX6g9ZrygZcumUPKAXU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda/go.mod h1:v9q5XN/HFJwSIQ9HiyzSh9Pgpkf0sdmLX2s4wWmub1c= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda h1:iZRa3/fpnTNmHXDFR4D/NsrayLX8jF388CARu+cUmnM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda/go.mod h1:45yXoVo9Jbbpsz92uqBbG2oVBkVEWv+4ROfek4yo0NE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda h1:rQpCTscXo3dHKvGS8BsSYFl3qw7YVD1Q3EQozJ1lhro= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda/go.mod h1:X6BH8wZUzqCnAYka7oy7QYoBUcN3xSXV6rZIxdXoArE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda h1:OcHCvCPu6hEC3+O1AOVLMOPdBpCejlYBV5g3t1PNzEA= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda/go.mod h1:aNNfBLYfQbTrwqWHK9JMaodwbDNG1lELDChC0mhKLJQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda h1:aAJQcMGyWpjmzhQ+1vN9ECFxDGz//1ahxejHrZLALKw= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda/go.mod h1:MovKp06tUSXe3MnKchEr1D8CdDZgIhYiw6D6sBjZy94= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda h1:1wimK5IfrRPT/QpUDlBUnz8ptI8XzKu+1qfyG3BNDcE= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda/go.mod h1:RBaXXXu0TgOgwWU+GKrNbBjVj6I6mZ3Kuwxphmx83hM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda h1:GErdWKIObiOTw7kpW63qbj7skhDtwf9g4oKQtTSVz6w= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda/go.mod h1:tZLl7PAQI9WT9QcUVeua4aK0EIZE1DZhQorO9WLoRGs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda h1:g6WvmCBJOwtgIWJt7/5C/536AZhxYljMmlzrd7cc1UM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda/go.mod h1:FmdoDrAFpzYtGWgaPrurpkB+ITnnOV/V/+uoFPovBKA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda h1:nIO5cUK1g1phQ8AiF0subHE2+GwMpPCHiCPNwJd7p8A= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda/go.mod h1:Zgt5E29gT4nxpbFBvx43u3fRNTfMAvqZxchXnjw+gOo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda h1:qfj+WIumpRq1y3XTcU7GvBZAd4HZLPR+wa0o6vYRSeo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda h1:3cFV3W8wX7bP3dKnxqzKRrDDmSsSaLSE8DUvIo3YOOo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda/go.mod h1:A6pOnDSKM3jdR7v/EOkKKuHWsR3GGm4T3Vr9jS1U6QA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda h1:rvTqa6/ho9dOeV7Oe0IEigr8G3ifMrGnZ48/s8BD9Y0= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda/go.mod h1:K4ChxIQRGSv8E4Cz3XSuZ38G5UwpTb/4p32vGMDpa1k= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda h1:HjGzAPpXxhRUEK+NA9ewibyhP9bX2Pk64dXmVcp+LHg= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda/go.mod h1:5qMnaoxtG8tgh9JRt99mH4aEw1Us6LFFigCQExPUeXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda h1:Q01pTaQLsk+HAxIhbdckz0YLTjtknIaxgeYP1GhTX9E= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda/go.mod h1:1PgQc8yQxp+tnTD2lzlyNGTngwImNyANUq74eRnHT5U= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda h1:nVZc4sq8D4YQ7TepKruBYDgHroPpZM/3G77yx1wGBy8= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda/go.mod h1:KtKLalpm2l5WOPMqKs6VETKre5j3sPUz0D16MXQd1QI= +github.com/openshift/kubernetes v0.0.0-20230317230219-54b552033300 h1:h2M3jex/AjGyd8e7pBYigFmPAayP3roc06q6J3HKoco= +github.com/openshift/kubernetes v0.0.0-20230317230219-54b552033300/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 h1:nnGkqLv0qBPNWVXdUHADm4Be3Eh8w9TVE00f0Xt8sQY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 h1:ragN1kE6gd+j6nEF8S2A1yXhUzdOxIS6gnvkUDNVb30= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300/go.mod h1:U0Mmzj5eyc8IBdGjsF2XR3dBQG0yqvhy468GKZvdfXU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 h1:Lw024mRBZImZJ5F/xyYGdO+iTJ5oknf6GQXC8yRIhqg= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 h1:NiBNPupH7L4htCv16fJ2/WTPzYs52GKidDAS7OxxN5I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300/go.mod h1:xwqK7Ox7oH/b11ZMPYtqPV/OYt2ZlYZf7XsuukECSc4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 h1:KEJkfVLrO/BeRALiQAfDpjqwoA/ptyekKeVuv4TEd94= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 h1:28FY5X/L7ijzCQqQzpSIx4PK07phJQG9HhmtthqGUnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 h1:h3UbWd4flQQJ8/ykxC2ek5VJh552bYMkr7+kSliT2vM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300/go.mod h1:C8LxhCSrMIvk2892MFXHd6Ygyy/cCVK30VOZZVm4KSM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 h1:ScW+Y49lv38LFDp+UOS18KpwPvpI5x+4/s9nuE/Q6j0= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300/go.mod h1:sf8VADmgVR2MzucAzvUaYsYLUi8S4onGjDNXWp6+iOw= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230317230219-54b552033300/go.mod h1:HDEVJ4fMSa8PKXQ5cJgG2PEEYCM9NDxpj7EojkpHatA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 h1:HMK7rO96/yCSjcopP7y0wYPyzR323YJwLa0tiLjx2h4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 h1:mKH/l6A3s644X2uwmwHMmBadSkIIv9z9xbJHXvBb4CI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300/go.mod h1:v9q5XN/HFJwSIQ9HiyzSh9Pgpkf0sdmLX2s4wWmub1c= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 h1:8zXaA0SwYuGbLK/2j9FiB9vn+CP5GJIr/YANmAJkGqk= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300/go.mod h1:45yXoVo9Jbbpsz92uqBbG2oVBkVEWv+4ROfek4yo0NE= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 h1:2Pzg74OsOY/EU+l1l82xW/qFk7jcujLNEXPAbFFn1uw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300/go.mod h1:X6BH8wZUzqCnAYka7oy7QYoBUcN3xSXV6rZIxdXoArE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 h1:jVuhdu8PVznfUV/ZHe7dUKGpStCwgwtp7gdlRG8CzFc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300/go.mod h1:aNNfBLYfQbTrwqWHK9JMaodwbDNG1lELDChC0mhKLJQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 h1:hK/WV2x7StuIF32uqEddqu4AlYcDVyppDvbdROin2j8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300/go.mod h1:MovKp06tUSXe3MnKchEr1D8CdDZgIhYiw6D6sBjZy94= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 h1:hu2JviOqm8QAzzWdVRtiNgpmrLq1L5XRyyjMO2VhIvA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300/go.mod h1:RBaXXXu0TgOgwWU+GKrNbBjVj6I6mZ3Kuwxphmx83hM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 h1:2oZOFxpNnQ0mkhzHESJweHTdIkNN+IYW81fXJpYGJzA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300/go.mod h1:tZLl7PAQI9WT9QcUVeua4aK0EIZE1DZhQorO9WLoRGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 h1:V7oGUbT26KJtMAT5xs1CNh5wEY09C0OdDBJGkVvKpWs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300/go.mod h1:FmdoDrAFpzYtGWgaPrurpkB+ITnnOV/V/+uoFPovBKA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 h1:NNpEouUab2JXFCuIIk/vJ23IVvoTOvbIziFTjmboBxA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300/go.mod h1:Zgt5E29gT4nxpbFBvx43u3fRNTfMAvqZxchXnjw+gOo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 h1:yeEdniKEdUGAYrksHklmdy+H3l4fD5RWI0tYIqv9qCw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 h1:mUFxOTs8b6tiAtAdI5HzQvlrcbUQNenWgmxCXzHLNuU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300/go.mod h1:A6pOnDSKM3jdR7v/EOkKKuHWsR3GGm4T3Vr9jS1U6QA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 h1:1SSdUgIlosBagi8g+mFZQr8zquhtjpuTOwRUmtzeuu0= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300/go.mod h1:K4ChxIQRGSv8E4Cz3XSuZ38G5UwpTb/4p32vGMDpa1k= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 h1:XvFyIK7KHCaEECSSaUblRBlqBUVj80EDmXfXVJvr300= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300/go.mod h1:5qMnaoxtG8tgh9JRt99mH4aEw1Us6LFFigCQExPUeXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 h1:S0oRyfuS2rGEDOk+JgYBnPJgWLrH+8Htyb/3BPTogbs= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300/go.mod h1:1PgQc8yQxp+tnTD2lzlyNGTngwImNyANUq74eRnHT5U= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 h1:5sDEwau0F3ToFsoswc5rbNi4LRwfJ6qzvW54LbkQI4Y= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300/go.mod h1:KtKLalpm2l5WOPMqKs6VETKre5j3sPUz0D16MXQd1QI= 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 4eee4849346ca8e94349268042cd9b074376013e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:17 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/k8s.io/apiserver/pkg/server/config.go | 3 + .../filters/with_early_late_annotations.go | 183 ++++++++++++++++++ .../apiserver/pkg/server/lifecycle_signals.go | 59 ++++-- .../pkg/server/patch_genericapiserver.go | 6 - .../csiinlinevolumesecurity/admission.go | 12 +- vendor/modules.txt | 110 +++++------ 6 files changed, 295 insertions(+), 78 deletions(-) create mode 100644 vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go index 7e34c6da7a..cd4844dced 100644 --- a/vendor/k8s.io/apiserver/pkg/server/config.go +++ b/vendor/k8s.io/apiserver/pkg/server/config.go @@ -958,6 +958,9 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler { handler = genericapifilters.WithAudit(handler, c.AuditBackend, c.AuditPolicyRuleEvaluator, c.LongRunningFunc) handler = filterlatency.TrackStarted(handler, c.TracerProvider, "audit") + handler = genericfilters.WithShutdownLateAnnotation(handler, c.lifecycleSignals.ShutdownInitiated, c.ShutdownDelayDuration) + handler = genericfilters.WithStartupEarlyAnnotation(handler, c.lifecycleSignals.HasBeenReady) + failedHandler := genericapifilters.Unauthorized(c.Serializer) failedHandler = genericapifilters.WithFailedAuthenticationAudit(failedHandler, c.AuditBackend, c.AuditPolicyRuleEvaluator) diff --git a/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go b/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go new file mode 100644 index 0000000000..8b7bcc421c --- /dev/null +++ b/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go @@ -0,0 +1,183 @@ +/* +Copyright 2023 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package filters + +import ( + "fmt" + "net" + "net/http" + "strings" + "time" + + "k8s.io/apiserver/pkg/audit" + "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/endpoints/request" + clockutils "k8s.io/utils/clock" + netutils "k8s.io/utils/net" +) + +type lifecycleEvent interface { + // Name returns the name of the signal, useful for logging. + Name() string + + // Signaled returns a channel that is closed when the underlying event + // has been signaled. Successive calls to Signaled return the same value. + Signaled() <-chan struct{} + + // SignaledAt returns the time the event was signaled. If SignaledAt is + // invoked before the event is signaled nil will be returned. + SignaledAt() *time.Time +} + +type shouldExemptFunc func(*http.Request) bool + +var ( + // the health probes are not annotated by default + healthProbes = []string{ + "/readyz", + "/healthz", + "/livez", + } +) + +func exemptIfHealthProbe(r *http.Request) bool { + path := "/" + strings.TrimLeft(r.URL.Path, "/") + for _, probe := range healthProbes { + if path == probe { + return true + } + } + return false +} + +// WithShutdownLateAnnotation, if added to the handler chain, tracks the +// incoming request(s) after the apiserver has initiated the graceful +// shutdown, and annoates the audit event for these request(s) with +// diagnostic information. +// This enables us to identify the actor(s)/load balancer(s) that are sending +// requests to the apiserver late during the server termination. +// It should be placed after (in order of execution) the +// 'WithAuthentication' filter. +func WithShutdownLateAnnotation(handler http.Handler, shutdownInitiated lifecycleEvent, delayDuration time.Duration) http.Handler { + return withShutdownLateAnnotation(handler, shutdownInitiated, delayDuration, exemptIfHealthProbe, clockutils.RealClock{}) +} + +// WithStartupEarlyAnnotation annotates the request with an annotation keyed as +// 'apiserver.k8s.io/startup' if the request arrives early (the server is not +// fully initialized yet). It should be placed after (in order of execution) +// the 'WithAuthentication' filter. +func WithStartupEarlyAnnotation(handler http.Handler, hasBeenReady lifecycleEvent) http.Handler { + return withStartupEarlyAnnotation(handler, hasBeenReady, exemptIfHealthProbe) +} + +func withShutdownLateAnnotation(handler http.Handler, shutdownInitiated lifecycleEvent, delayDuration time.Duration, shouldExemptFn shouldExemptFunc, clock clockutils.PassiveClock) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + select { + case <-shutdownInitiated.Signaled(): + default: + handler.ServeHTTP(w, req) + return + } + + if shouldExemptFn(req) { + handler.ServeHTTP(w, req) + return + } + shutdownInitiatedAt := shutdownInitiated.SignaledAt() + if shutdownInitiatedAt == nil { + handler.ServeHTTP(w, req) + return + } + + elapsedSince := clock.Since(*shutdownInitiatedAt) + // TODO: 80% is the threshold, if requests arrive after 80% of + // shutdown-delay-duration elapses we annotate the request as late=true. + late := lateMsg(delayDuration, elapsedSince, 80) + + // NOTE: some upstream unit tests have authentication disabled and will + // fail if we require the requestor to be present in the request + // context. Fixing those unit tests will increase the chance of merge + // conflict during rebase. + // This also implies that this filter must be placed after (in order of + // execution) the 'WithAuthentication' filter. + self := "self=" + if requestor, exists := request.UserFrom(req.Context()); exists && requestor != nil { + self = fmt.Sprintf("%s%t", self, requestor.GetName() == user.APIServerUser) + } + + audit.AddAuditAnnotation(req.Context(), "apiserver.k8s.io/shutdown", + fmt.Sprintf("%s %s loopback=%t", late, self, isLoopback(req.RemoteAddr))) + + handler.ServeHTTP(w, req) + }) +} + +func lateMsg(delayDuration, elapsedSince time.Duration, threshold float64) string { + if delayDuration == time.Duration(0) { + return fmt.Sprintf("elapsed=%s threshold= late=%t", elapsedSince.Round(time.Second).String(), true) + } + + percentElapsed := (float64(elapsedSince) / float64(delayDuration)) * 100 + return fmt.Sprintf("elapsed=%s threshold=%.2f%% late=%t", + elapsedSince.Round(time.Second).String(), percentElapsed, percentElapsed > threshold) +} + +func withStartupEarlyAnnotation(handler http.Handler, hasBeenReady lifecycleEvent, shouldExemptFn shouldExemptFunc) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + select { + case <-hasBeenReady.Signaled(): + handler.ServeHTTP(w, req) + return + default: + } + + // NOTE: some upstream unit tests have authentication disabled and will + // fail if we require the requestor to be present in the request + // context. Fixing those unit tests will increase the chance of merge + // conflict during rebase. + // This also implies that this filter must be placed after (in order of + // execution) the 'WithAuthentication' filter. + self := "self=" + if requestor, exists := request.UserFrom(req.Context()); exists && requestor != nil { + if requestor.GetName() == user.APIServerUser { + handler.ServeHTTP(w, req) + return + } + self = fmt.Sprintf("%s%t", self, false) + } + + audit.AddAuditAnnotation(req.Context(), "apiserver.k8s.io/startup", + fmt.Sprintf("early=true %s loopback=%t", self, isLoopback(req.RemoteAddr))) + + handler.ServeHTTP(w, req) + }) +} + +func isLoopback(address string) bool { + host, _, err := net.SplitHostPort(address) + if err != nil { + // if the address is missing a port, SplitHostPort will return an error + // with an empty host, and port value. For such an error, we should + // continue and try to parse the original address. + host = address + } + if ip := netutils.ParseIPSloppy(host); ip != nil { + return ip.IsLoopback() + } + + return false +} diff --git a/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go b/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go index ce4c1b4a6e..4d299a66c2 100644 --- a/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go +++ b/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go @@ -18,6 +18,10 @@ package server import ( "sync" + "sync/atomic" + "time" + + utilsclock "k8s.io/utils/clock" ) /* @@ -100,6 +104,10 @@ type lifecycleSignal interface { // Name returns the name of the signal, useful for logging. Name() string + + // SignaledAt returns the time the event was signaled. If SignaledAt is + // invoked before the event is signaled nil will be returned. + SignaledAt() *time.Time } // lifecycleSignals provides an abstraction of the events that @@ -149,23 +157,25 @@ type lifecycleSignals struct { // newLifecycleSignals returns an instance of lifecycleSignals interface to be used // to coordinate lifecycle of the apiserver func newLifecycleSignals() lifecycleSignals { + clock := utilsclock.RealClock{} return lifecycleSignals{ - ShutdownInitiated: newNamedChannelWrapper("ShutdownInitiated"), - AfterShutdownDelayDuration: newNamedChannelWrapper("AfterShutdownDelayDuration"), - PreShutdownHooksStopped: newNamedChannelWrapper("PreShutdownHooksStopped"), - NotAcceptingNewRequest: newNamedChannelWrapper("NotAcceptingNewRequest"), - InFlightRequestsDrained: newNamedChannelWrapper("InFlightRequestsDrained"), - HTTPServerStoppedListening: newNamedChannelWrapper("HTTPServerStoppedListening"), - HasBeenReady: newNamedChannelWrapper("HasBeenReady"), - MuxAndDiscoveryComplete: newNamedChannelWrapper("MuxAndDiscoveryComplete"), + ShutdownInitiated: newNamedChannelWrapper("ShutdownInitiated", clock), + AfterShutdownDelayDuration: newNamedChannelWrapper("AfterShutdownDelayDuration", clock), + PreShutdownHooksStopped: newNamedChannelWrapper("PreShutdownHooksStopped", clock), + NotAcceptingNewRequest: newNamedChannelWrapper("NotAcceptingNewRequest", clock), + InFlightRequestsDrained: newNamedChannelWrapper("InFlightRequestsDrained", clock), + HTTPServerStoppedListening: newNamedChannelWrapper("HTTPServerStoppedListening", clock), + HasBeenReady: newNamedChannelWrapper("HasBeenReady", clock), + MuxAndDiscoveryComplete: newNamedChannelWrapper("MuxAndDiscoveryComplete", clock), } } -func newNamedChannelWrapper(name string) lifecycleSignal { +func newNamedChannelWrapper(name string, clock utilsclock.PassiveClock) lifecycleSignal { return &namedChannelWrapper{ - name: name, - once: sync.Once{}, - ch: make(chan struct{}), + name: name, + once: sync.Once{}, + ch: make(chan struct{}), + clock: clock, } } @@ -173,10 +183,27 @@ type namedChannelWrapper struct { name string once sync.Once ch chan struct{} + + clock utilsclock.PassiveClock + signaledAt atomic.Value } func (e *namedChannelWrapper) Signal() { e.once.Do(func() { + // set the signaledAt value first to support the expected use case: + // + // <-s.Signaled() + // .. + // at := s.SignaledAt() + // + // we guarantee that at will never be nil after the event is signaled, + // it also implies that 'SignaledAt' if used independently outside of + // the above use case, it may return a valid non-empty time (due to + // the delay between setting signaledAt and closing the channel) + // even when the event has not signaled yet. + now := e.clock.Now() + e.signaledAt.Store(&now) + close(e.ch) }) } @@ -188,3 +215,11 @@ func (e *namedChannelWrapper) Signaled() <-chan struct{} { func (e *namedChannelWrapper) Name() string { return e.name } + +func (e *namedChannelWrapper) SignaledAt() *time.Time { + value := e.signaledAt.Load() + if value == nil { + return nil + } + return value.(*time.Time) +} diff --git a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go index 46a734b29a..1fe3b7e5ef 100644 --- a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go +++ b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go @@ -17,7 +17,6 @@ limitations under the License. package server import ( - "fmt" "net" "net/http" "strings" @@ -27,7 +26,6 @@ import ( "go.uber.org/atomic" corev1 "k8s.io/api/core/v1" - "k8s.io/apiserver/pkg/audit" "k8s.io/klog/v2" netutils "k8s.io/utils/net" ) @@ -82,10 +80,8 @@ func WithLateConnectionFilter(handler http.Handler) http.Handler { if late { if pth := "/" + strings.TrimLeft(r.URL.Path, "/"); pth != "/readyz" && pth != "/healthz" && pth != "/livez" { if isLocal(r) { - audit.AddAuditAnnotation(r.Context(), "openshift.io/during-graceful", fmt.Sprintf("loopback=true,%v,readyz=false", r.URL.Host)) klog.V(4).Infof("Loopback request to %q (user agent %q) through connection created very late in the graceful termination process (more than 80%% has passed). This client probably does not watch /readyz and might get failures when termination is over.", r.URL.Path, r.UserAgent()) } else { - audit.AddAuditAnnotation(r.Context(), "openshift.io/during-graceful", fmt.Sprintf("loopback=false,%v,readyz=false", r.URL.Host)) klog.Warningf("Request to %q (source IP %s, user agent %q) through a connection created very late in the graceful termination process (more than 80%% has passed), possibly a sign for a broken load balancer setup.", r.URL.Path, r.RemoteAddr, r.UserAgent()) // create only one event to avoid event spam. @@ -122,11 +118,9 @@ func WithNonReadyRequestLogging(handler http.Handler, hasBeenReadySignal lifecyc if pth := "/" + strings.TrimLeft(r.URL.Path, "/"); pth != "/readyz" && pth != "/healthz" && pth != "/livez" { if isLocal(r) { if !isKubeApiserverLoopBack(r) { - audit.AddAuditAnnotation(r.Context(), "openshift.io/unready", fmt.Sprintf("loopback=true,%v,readyz=false", r.URL.Host)) klog.V(2).Infof("Loopback request to %q (user agent %q) before server is ready. This client probably does not watch /readyz and might get inconsistent answers.", r.URL.Path, r.UserAgent()) } } else { - audit.AddAuditAnnotation(r.Context(), "openshift.io/unready", fmt.Sprintf("loopback=false,%v,readyz=false", r.URL.Host)) klog.Warningf("Request to %q (source IP %s, user agent %q) before server is ready, possibly a sign for a broken load balancer setup.", r.URL.Path, r.RemoteAddr, r.UserAgent()) // create only one event to avoid event spam. diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity/admission.go index 664f70b382..35e249acc3 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity/admission.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity/admission.go @@ -33,6 +33,8 @@ const ( defaultPodSecEnforceProfile = podsecapi.LevelRestricted defaultPodSecWarnProfile = podsecapi.LevelRestricted defaultPodSecAuditProfile = podsecapi.LevelRestricted + // Format string used for audit/warn/enforce response messages + admissionResponseFormatStr = "%s uses an inline volume provided by CSIDriver %s and namespace %s has a pod security %s level that is lower than %s" ) var ( @@ -155,12 +157,12 @@ func (c *csiInlineVolSec) Validate(ctx context.Context, attrs admission.Attribut // Extract the pod spec to evaluate obj := attrs.GetObject() - podMeta, podSpec, err := c.podSpecExtractor.ExtractPodSpec(obj) + _, podSpec, err := c.podSpecExtractor.ExtractPodSpec(obj) if err != nil { return admission.NewForbidden(attrs, fmt.Errorf("failed to extract pod spec: %v", err)) } // If an object with an optional pod spec does not contain a pod spec, skip validation - if podMeta == nil && podSpec == nil { + if podSpec == nil { return nil } @@ -188,15 +190,15 @@ func (c *csiInlineVolSec) Validate(ctx context.Context, attrs admission.Attribut // Compare CSIDriver level to the policy for the namespace if podsecapi.CompareLevels(nsPolicy.Enforce.Level, driverLevel) > 0 { // Not permitted, enforce error and deny admission - return admission.NewForbidden(attrs, fmt.Errorf("admission denied: pod %s uses an inline volume provided by CSIDriver %s and namespace %s has a pod security enforce level that is lower than %s", podMeta.Name, driverName, namespace.Name, driverLevel)) + return admission.NewForbidden(attrs, fmt.Errorf(admissionResponseFormatStr, attrs.GetName(), driverName, attrs.GetNamespace(), "enforce", driverLevel)) } if podsecapi.CompareLevels(nsPolicy.Warn.Level, driverLevel) > 0 { // Violates policy warn level, add warning - warning.AddWarning(ctx, "", fmt.Sprintf("pod %s uses an inline volume provided by CSIDriver %s and namespace %s has a pod security warn level that is lower than %s", podMeta.Name, driverName, namespace.Name, driverLevel)) + warning.AddWarning(ctx, "", fmt.Sprintf(admissionResponseFormatStr, attrs.GetName(), driverName, attrs.GetNamespace(), "warn", driverLevel)) } if podsecapi.CompareLevels(nsPolicy.Audit.Level, driverLevel) > 0 { // Violates policy audit level, add audit annotation - auditMessageString := fmt.Sprintf("pod %s uses an inline volume provided by CSIDriver %s and namespace %s has a pod security audit level that is lower than %s", podMeta.Name, driverName, namespace.Name, driverLevel) + auditMessageString := fmt.Sprintf(admissionResponseFormatStr, attrs.GetName(), driverName, attrs.GetNamespace(), "audit", driverLevel) audit.AddAuditAnnotation(ctx, PluginName, auditMessageString) } } diff --git a/vendor/modules.txt b/vendor/modules.txt index e3c166d972..8af4244407 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda +# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda +# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda +# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes v0.0.0-20230306172737-3754ece77dda +# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230317230219-54b552033300 ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3048,7 +3048,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-20230306172737-3754ece77dda +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3091,7 +3091,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-20230306172737-3754ece77dda +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3106,10 +3106,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-20230306172737-3754ece77dda +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 ## 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-20230306172737-3754ece77dda +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3252,33 +3252,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-20230306172737-3754ece77dda -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230306172737-3754ece77dda -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230306172737-3754ece77dda -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230306172737-3754ece77dda +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230317230219-54b552033300 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230317230219-54b552033300 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230317230219-54b552033300 From 7f36de3acea3c749bf794f490f3a450c6612b8fe Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:17 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 70 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 48 ++++++++++++++++++------------------ 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 104baee1b2..f3690d61dc 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -137,39 +137,39 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230306172737-3754ece77dda // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230306172737-3754ece77dda // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230316155625-384dc49aed5e // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230317230219-54b552033300 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230317230219-54b552033300 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index fbeb61a9c4..3c95c6fd03 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -359,30 +359,30 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:V681KQQqIHNe46Cx+EIbw04kBeK73fVmjU17/bLSd48= -github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:CznQ70pOj1YwdXyPprLgAILh4TZPcI8IDML6OOXhg2o= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= -github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:+1seo/rJ92p92SGlTNJshSvmfY497KLj35J4MzDulJA= -github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:qvRmgvbB+XYn4xlw8hPDNJpecPuQRcHaQmcggIn3uOI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:qATwUzDb6MLyGWq2nUj+jwXqZJcxkCuabh0P7Cuff3k= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:F2zw47hfDpS5Q+bSD8zN3MCssTDibKsD2nOAqHxINc0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= -github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:dlpgsW1KSYbbI8pV2T1n38SvXGbxsJwwpHqJ8NHqH4w= -github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda h1:6kfaDiGwUbHa1Ow05SXNS0E4MbVUSzG2dA2km+PY3JM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda h1:8Cwr2khjukggvuYqNv3jFqRsIVA4qPQqMQwmA9n9w/0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda h1:4uXMRgHzI6Sqga3ZfrWjIkQgGAEI9QZDP9x0ploLRVs= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda h1:Y1fPbnj15DQrh4xjT8UmsMIPH83UKxnJKZhX8m+7vCk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda h1:tkwDZgUx2iYk5w/cNYRz/ofr8OX6986+C0Rd4ny0QZ0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda h1:qfj+WIumpRq1y3XTcU7GvBZAd4HZLPR+wa0o6vYRSeo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= +github.com/openshift/etcd/api/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:tCxcwZ1B6EwA1HcVCKRTf4sBlAZrbCp0Uzui6e5KxoQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:Xig9mR2/jbsUN3Bjv2LROH28/7teheHN3562jYczR/A= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= +github.com/openshift/etcd/client/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:b5nKMLhTzRPIc3bhXSQ+gy3pRCt3eAGH77YBMPaJCUg= +github.com/openshift/etcd/client/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:fRClmnLezsNODLGZI1eKM0V7YrgVZNgg2CLggYnT5PI= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:qATwUzDb6MLyGWq2nUj+jwXqZJcxkCuabh0P7Cuff3k= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:v2W3uZC/4Fq0oQkkdYo67RXr/iQ7V0jOLpjYvJenXgY= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= +github.com/openshift/etcd/server/v3 v3.5.1-0.20230316155625-384dc49aed5e h1:dGHn3v1bkbuXZhl++uAg7zLmmg5ntFGcXJIhfQuHcDw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20230316155625-384dc49aed5e/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 h1:nnGkqLv0qBPNWVXdUHADm4Be3Eh8w9TVE00f0Xt8sQY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 h1:Lw024mRBZImZJ5F/xyYGdO+iTJ5oknf6GQXC8yRIhqg= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 h1:KEJkfVLrO/BeRALiQAfDpjqwoA/ptyekKeVuv4TEd94= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 h1:28FY5X/L7ijzCQqQzpSIx4PK07phJQG9HhmtthqGUnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 h1:HMK7rO96/yCSjcopP7y0wYPyzR323YJwLa0tiLjx2h4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 h1:yeEdniKEdUGAYrksHklmdy+H3l4fD5RWI0tYIqv9qCw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= 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 b5f9e1d870e24eadf4598331956b4f7772869826 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:21 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 94 ++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index ae646c5706..7682cfe27b 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -257,7 +257,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.6 ## explicit; go 1.12 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.6 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/api/v3 v3.5.6 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -266,7 +266,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.6 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/client/pkg/v3 v3.5.6 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -279,14 +279,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.6 ## explicit; go 1.16 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.6 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/client/v3 v3.5.6 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.6 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/pkg/v3 v3.5.6 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -303,14 +303,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.6 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/raft/v3 v3.5.6 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.5 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/server/v3 v3.5.5 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230316155625-384dc49aed5e ## explicit; go 1.16 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 ## 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.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 ## explicit; go 1.19 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -992,38 +992,38 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230306172737-3754ece77dda -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230306172737-3754ece77dda -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230306172737-3754ece77dda -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230306172737-3754ece77dda -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230306172737-3754ece77dda -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230306172737-3754ece77dda -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230306172737-3754ece77dda -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230306172737-3754ece77dda -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230306172737-3754ece77dda -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230306172737-3754ece77dda -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230306172737-3754ece77dda -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230306172737-3754ece77dda -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230306172737-3754ece77dda -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230306172737-3754ece77dda -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230306172737-3754ece77dda -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230306172737-3754ece77dda -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230306172737-3754ece77dda -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230306172737-3754ece77dda -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230306172737-3754ece77dda -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230306172737-3754ece77dda -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230306172737-3754ece77dda -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230306172737-3754ece77dda +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230316155625-384dc49aed5e +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230316155625-384dc49aed5e +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230316155625-384dc49aed5e +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230316155625-384dc49aed5e +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230316155625-384dc49aed5e +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230317230219-54b552033300 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230317230219-54b552033300 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230317230219-54b552033300 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230317230219-54b552033300 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230317230219-54b552033300 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230317230219-54b552033300 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230317230219-54b552033300 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230317230219-54b552033300 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230317230219-54b552033300 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230317230219-54b552033300 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230317230219-54b552033300 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230317230219-54b552033300 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230317230219-54b552033300 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230317230219-54b552033300 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230317230219-54b552033300 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230317230219-54b552033300 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230317230219-54b552033300 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230317230219-54b552033300 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230317230219-54b552033300 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230317230219-54b552033300 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230317230219-54b552033300 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230317230219-54b552033300 From 4b64f4de8c244aa28172f33404eae790640adcc0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:21 +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 8a3ad2a8cc..b2b0f09ae2 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:98ab12770309ac075fbfa617028d5ba800294309b8ec64f9ab9a2170cb90e17a" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab629479e5ce4605d433293e5af9ebab0ea6594a8e0837669da3dc9878324baf" 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 febac3c582..866b1563a3 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:356f2fa7e4f7bb22a1a5a9797a2eee57ec31a4b28d7d9802b89174b009fda1f1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da4ffec08e809e749d422ed744c61f42290e2f8594e31ef5ad5edb13a8ee1723" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 0549677eddf554d1c61b4f30ab547f17836349b8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:22 +0000 Subject: [PATCH 8/9] update manifests --- assets/release/release-aarch64.json | 14 +++++++------- assets/release/release-x86_64.json | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 09ce9239fe..ad66b1dfd4 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-03-14-010802" + "base": "4.14.0-0.nightly-arm64-2023-03-20-191904" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:509f0fc677b3d0720720639806d80488cd96edcd756391266ecdd608b224f0fe", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4afc7eb2b462e9998b78b14aaeb5d2e2542b5215d1c923cadf45813be58eddd", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02d85404d7e0040487cf5a1741a68cb287e67805cf62687601c7dced17af3039", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07d87fe9cf8bc03412ceaf1312873ee0eac1f9c95bca5f731db5e5d540392c0d", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef2a3e10cb18dfc3cb90abe7b8226622610a2552b12189b4063014fd6c2452c0", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dff7deb28bf28b9c1f82e599338d55b3e81c1d5be55d91b339316bdb77fb1ce3", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861c84955885e202a6d47c3d6e9b435b7e0b471a0f75c0f92acbd94ef4d45a46", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c79d2b13d414568eac75c989d6e20836fd858bc54decdcf6a45d3a8ceecb133", "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:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:356f2fa7e4f7bb22a1a5a9797a2eee57ec31a4b28d7d9802b89174b009fda1f1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31c6c8d0d309d32b13cfcc18eb7236762e2ba7fcb71ed539eec2200e6630ba39", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da4ffec08e809e749d422ed744c61f42290e2f8594e31ef5ad5edb13a8ee1723", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ab4415b89f9dd61c832c6c6c58540904fb43be4cf6a49470868bac9ebf9f055", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 3920b29316..8f2792e8bf 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-0.nightly-2023-03-08-194110" + "base": "4.14.0-0.nightly-2023-03-20-201450" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d241d09890258c810937d8013f31ce3405412161c51b7723a590a37303862bb", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c2eaa88d1aab0565dfc3ab001c6a829a04b591dbb0265702813a9f0c22d99fd", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adcdbff7f3bf4c5b27557d9b74401be60a771d691f723857da8fe34fcb016f21", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3a21964b446ad1febcdb5e8469938a42a6036baa529cc24b670b839b4c2edc7", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8737df72b9e969d819cfca97e312633a3b7630c5758343c1a420f0eccd591036", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1028d9d0021079fa554451f1be1029f36908a6ff6864ae92cb9a00925589ed9", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3664f025ca01501e625c9d57d81d5080d3fd9f51c4625c904ad5bd7bacc311d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6731a042dcf48063d026e01d2171d2d943fcabbcee625fe46298ac2ea8d4255", "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:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98ab12770309ac075fbfa617028d5ba800294309b8ec64f9ab9a2170cb90e17a", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1638cbed9207a1cc2f84af5e0c4f70f47140028c7d0154fbdc9d594dedf29062", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab629479e5ce4605d433293e5af9ebab0ea6594a8e0837669da3dc9878324baf", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50019a0538f3febbd2c4560a4fca3f0fdd050210796456ec218ffefdb364854c", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0", From 8bf3cd26e11c4071d10360819ad51390904871bf Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Mar 2023 05:14:22 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 90c02bb226..862c9444e3 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.0 -KUBE_GIT_COMMIT=3754ece77dda848d508b37369a1f2646faaeae13 +KUBE_GIT_COMMIT=54b552033300ab1f94ddf8a9d16032e6619556da KUBE_GIT_TREE_STATE=clean