From 5e9942ae54b0bb8ec3df85790acd0d51e76ff995 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:14:32 +0000 Subject: [PATCH 1/8] 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 1a88bd6491..45be5292e1 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-05-29-174116" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-05-29-213325" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-04-192121" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 3637cbccd0a6a5495e6588b42e129479dd01c346 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:14:33 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 80 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 32 ++++++------- 2 files changed, 96 insertions(+), 16 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..c746154d8e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,80 @@ +- cluster-ingress-operator embedded-component 90d2feaaf3b4e657ce46098077e894aec053f7ca to b2af3796ef0ded090ebb837ba07cb6e2fb7978f3 + - ee58397 2023-06-01T14:43:52-04:00 Pull operand proxy variables from the cluster proxy config instead of the ingress operator's environment + - b648921 2023-05-31T16:48:17-04:00 Revert "Revert "OCPBUGS-6661, OCPBUGS-9464: Move mTLS CRL handling into the router, and fix accidental duplication of CRLs"" + - 8f98c61 2023-05-26T14:50:58-04:00 OCPBUGS-13963: Bump vendors k8s libraries to 0.27.2 + +- cluster-kube-apiserver-operator embedded-component dbe789b8b0c0354e8094267d904b966e430104ed to 0afbcf1bafc85805fa9d8f8a55df1d7c27e47012 + - 1996db8 2023-05-31T10:43:22+02:00 Change manifest directory permissions + - a9e50ec 2023-05-10T16:24:35-04:00 remove the old featureset flag from rendering + - 7b30080 2023-05-10T16:24:35-04:00 update library-go for render flag updates + +- cluster-kube-controller-manager-operator embedded-component c27b0e585ff6c7d68f72ce8a74ab90dd9567ed19 to 1e15498f434994aa6676c146638b886e08c93aa5 + - b05a7f6 2023-05-31T10:57:51+02:00 Change manifest directory permissions + - df62336 2023-05-23T16:49:11+02:00 add "openshift-infra" into kubeInformers for StaticResourceController + - 349c769 2023-05-23T16:44:34+02:00 remove RBAC for cluster-policy-controller CM leader election + +- cluster-kube-scheduler-operator embedded-component d67fd0782ff7060e548446815f460d6c9e10e057 to f42458c923d20576d88decb5495888c410ac6051 + - 7f0192a 2023-05-31T10:30:38+02:00 Change manifest directory permissions + +- cluster-network-operator embedded-component f68e72f6cf4315646e2baecf2f2e2370b012f2b8 to 6c0b42e4aec50b530ed68138435fb25101c5453b + - cfa1d6d 2023-05-29T18:31:20+02:00 OCPBUGS-11882: Added safe-to-evict annotation to ovnkube-master, multus admission controller and cloud-network-config components + +- cluster-openshift-controller-manager-operator embedded-component cb01e0b306daedbe42d50d9b0e88ce2618863647 to 2628fefee51de6da59388603881ea8d4f2b032d9 + - 7cca767 2023-05-21T13:46:07+08:00 add loglevel controller for ocm-O + +- kubernetes embedded-component 15f19ea2dd700767e5337502aec753d2a6e26905 to cc041e853bbd41b7b675d3563c445d01336bda33 + - b5a21166e 2023-06-01T14:51:32-04:00 UPSTREAM: 118383: bump cadvisor for upstream patch 3301 + +- openshift-controller-manager embedded-component 76ef4f658ee7a5e6e4038f2860ef2bb9bc36e579 to 41104bfd3c2a492e4e20516fd7065b9c86e2ad7e + - c5766ba 2023-06-01T15:28:18-04:00 code updates due to version bumps + - 145954f 2023-06-01T15:27:59-04:00 vendoring dependencies + - f83079e 2023-06-01T15:27:26-04:00 Updating Kubernetes and dependencies + +- oc image-amd64 943559197d1a94253672e26dbc356e062df7a66d to 60caadec339755236fdac53b50defd79991d3409 + - 568677d 2023-05-31T10:10:54+02:00 oc adm groups sync: all groups: print warning before caching + - 97ef696 2023-05-11T14:40:23-04:00 OCPBUGS-12793: refactored the processing of the manifest list to serialize directly to dockerImage.Config + - 9b85730 2023-05-11T07:47:38-04:00 Use 'multi' when mirroring a multi release image + +- router image-amd64 5426a9b1597b9afd70b9d49caebe00cee6cc433f to ec0a69fdd7b1dc8a968dc679fe39a7b99d3160c9 + - ab86723 2023-05-23T13:34:02-04:00 OCPBUGS-13969: Bump vendors k8s libraries to 0.27.2 + +- ovn-kubernetes image-amd64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b to 8adae676ccfed289ea097ac70afe7970dca3f820 + - 34cc232 2023-05-26T10:46:42+02:00 Bump OVN RPMs to 23.03.0-49.el9fdp + - 61e0379 2023-04-05T19:02:52+02:00 lb_config: Reduce number of required LB backend templates for NodePort. + - 4b3475a 2023-04-05T19:02:46+02:00 services: Use OVN template load balancers for NodePort services. + - 91b2e29 2023-04-05T09:38:22+02:00 model_client: Properly update map values. + - 0cdb9ec 2023-04-05T09:38:22+02:00 fedora: Update OVN to 23.03.0-16. + - 7e7e141 2023-04-05T09:38:22+02:00 dbs: Bump OVN schema to 23.03. + - b79d290 2023-04-05T09:38:22+02:00 Rename OVN_VERSION to OVN_SCHEMA_VERSION. + - 3207e3f 2023-04-05T09:38:22+02:00 lb_config: Merge LB referenced groups when merging LBs. + - c258f60 2023-04-05T09:38:22+02:00 node_tracker: Store node IPs as net.IP instead of string. + - 9ded3d8 2023-04-05T09:38:22+02:00 node_tracker: Track node chassis IDs too. + - b1fba8f 2023-04-05T09:38:22+02:00 services_controller_test: Test with LB groups enabled. + +- kubernetes image-amd64 15f19ea2dd700767e5337502aec753d2a6e26905 to cc041e853bbd41b7b675d3563c445d01336bda33 + - b5a21166e 2023-06-01T14:51:32-04:00 UPSTREAM: 118383: bump cadvisor for upstream patch 3301 + +- oc image-arm64 943559197d1a94253672e26dbc356e062df7a66d to 60caadec339755236fdac53b50defd79991d3409 + - 568677d 2023-05-31T10:10:54+02:00 oc adm groups sync: all groups: print warning before caching + - 97ef696 2023-05-11T14:40:23-04:00 OCPBUGS-12793: refactored the processing of the manifest list to serialize directly to dockerImage.Config + - 9b85730 2023-05-11T07:47:38-04:00 Use 'multi' when mirroring a multi release image + +- router image-arm64 5426a9b1597b9afd70b9d49caebe00cee6cc433f to ec0a69fdd7b1dc8a968dc679fe39a7b99d3160c9 + - ab86723 2023-05-23T13:34:02-04:00 OCPBUGS-13969: Bump vendors k8s libraries to 0.27.2 + +- ovn-kubernetes image-arm64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b to 8adae676ccfed289ea097ac70afe7970dca3f820 + - 34cc232 2023-05-26T10:46:42+02:00 Bump OVN RPMs to 23.03.0-49.el9fdp + - 61e0379 2023-04-05T19:02:52+02:00 lb_config: Reduce number of required LB backend templates for NodePort. + - 4b3475a 2023-04-05T19:02:46+02:00 services: Use OVN template load balancers for NodePort services. + - 91b2e29 2023-04-05T09:38:22+02:00 model_client: Properly update map values. + - 0cdb9ec 2023-04-05T09:38:22+02:00 fedora: Update OVN to 23.03.0-16. + - 7e7e141 2023-04-05T09:38:22+02:00 dbs: Bump OVN schema to 23.03. + - b79d290 2023-04-05T09:38:22+02:00 Rename OVN_VERSION to OVN_SCHEMA_VERSION. + - 3207e3f 2023-04-05T09:38:22+02:00 lb_config: Merge LB referenced groups when merging LBs. + - c258f60 2023-04-05T09:38:22+02:00 node_tracker: Store node IPs as net.IP instead of string. + - 9ded3d8 2023-04-05T09:38:22+02:00 node_tracker: Track node chassis IDs too. + - b1fba8f 2023-04-05T09:38:22+02:00 services_controller_test: Test with LB groups enabled. + +- kubernetes image-arm64 15f19ea2dd700767e5337502aec753d2a6e26905 to cc041e853bbd41b7b675d3563c445d01336bda33 + - b5a21166e 2023-06-01T14:51:32-04:00 UPSTREAM: 118383: bump cadvisor for upstream patch 3301 + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3490882ad1..4bb964f0cc 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,28 @@ https://github.com/openshift/cluster-dns-operator embedded-component 8d84af3ad3ebd7462c26b86eceb218a1cc8ae845 -https://github.com/openshift/cluster-ingress-operator embedded-component 90d2feaaf3b4e657ce46098077e894aec053f7ca -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component dbe789b8b0c0354e8094267d904b966e430104ed -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c27b0e585ff6c7d68f72ce8a74ab90dd9567ed19 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d67fd0782ff7060e548446815f460d6c9e10e057 -https://github.com/openshift/cluster-network-operator embedded-component f68e72f6cf4315646e2baecf2f2e2370b012f2b8 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component cb01e0b306daedbe42d50d9b0e88ce2618863647 +https://github.com/openshift/cluster-ingress-operator embedded-component b2af3796ef0ded090ebb837ba07cb6e2fb7978f3 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 0afbcf1bafc85805fa9d8f8a55df1d7c27e47012 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1e15498f434994aa6676c146638b886e08c93aa5 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f42458c923d20576d88decb5495888c410ac6051 +https://github.com/openshift/cluster-network-operator embedded-component 6c0b42e4aec50b530ed68138435fb25101c5453b +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2628fefee51de6da59388603881ea8d4f2b032d9 https://github.com/openshift/cluster-policy-controller embedded-component cc787e1b1e177696817b66689a03471914083a67 https://github.com/openshift/etcd embedded-component 53cdd6b0519f0e57da9032b473465799bba4b1a0 -https://github.com/openshift/kubernetes embedded-component 15f19ea2dd700767e5337502aec753d2a6e26905 +https://github.com/openshift/kubernetes embedded-component cc041e853bbd41b7b675d3563c445d01336bda33 https://github.com/openshift/machine-config-operator embedded-component 5843b7a4b27f15bc3313ce8a41ef6de792081fcb -https://github.com/openshift/openshift-controller-manager embedded-component 76ef4f658ee7a5e6e4038f2860ef2bb9bc36e579 +https://github.com/openshift/openshift-controller-manager embedded-component 41104bfd3c2a492e4e20516fd7065b9c86e2ad7e https://github.com/openshift/route-controller-manager embedded-component 38d9ec83ce464e9198af05918ab03a7995a11866 https://github.com/openshift/service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-amd64 943559197d1a94253672e26dbc356e062df7a66d +https://github.com/openshift/oc image-amd64 60caadec339755236fdac53b50defd79991d3409 https://github.com/openshift/coredns image-amd64 a2c62dd3976b27d6a45e273532c63ba914700917 -https://github.com/openshift/router image-amd64 5426a9b1597b9afd70b9d49caebe00cee6cc433f +https://github.com/openshift/router image-amd64 ec0a69fdd7b1dc8a968dc679fe39a7b99d3160c9 https://github.com/openshift/kube-rbac-proxy image-amd64 27c255551673ba529ac6c9419abe13451afa3e4d -https://github.com/openshift/ovn-kubernetes image-amd64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b -https://github.com/openshift/kubernetes image-amd64 15f19ea2dd700767e5337502aec753d2a6e26905 +https://github.com/openshift/ovn-kubernetes image-amd64 8adae676ccfed289ea097ac70afe7970dca3f820 +https://github.com/openshift/kubernetes image-amd64 cc041e853bbd41b7b675d3563c445d01336bda33 https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-arm64 943559197d1a94253672e26dbc356e062df7a66d +https://github.com/openshift/oc image-arm64 60caadec339755236fdac53b50defd79991d3409 https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 -https://github.com/openshift/router image-arm64 5426a9b1597b9afd70b9d49caebe00cee6cc433f +https://github.com/openshift/router image-arm64 ec0a69fdd7b1dc8a968dc679fe39a7b99d3160c9 https://github.com/openshift/kube-rbac-proxy image-arm64 27c255551673ba529ac6c9419abe13451afa3e4d -https://github.com/openshift/ovn-kubernetes image-arm64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b -https://github.com/openshift/kubernetes image-arm64 15f19ea2dd700767e5337502aec753d2a6e26905 +https://github.com/openshift/ovn-kubernetes image-arm64 8adae676ccfed289ea097ac70afe7970dca3f820 +https://github.com/openshift/kubernetes image-arm64 cc041e853bbd41b7b675d3563c445d01336bda33 https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae From e2d88ecf3c31204be186a4c425792c56ef9b2997 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:16:31 +0000 Subject: [PATCH 3/8] 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 d32d98c6eb..6a3d376031 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.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230602122057-cc041e853bbd // from kubernetes ) diff --git a/go.sum b/go.sum index 50f29a1d6f..53a6d01cb1 100644 --- a/go.sum +++ b/go.sum @@ -602,57 +602,57 @@ github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrk github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17 h1:O64VIXF1g9CdA+dIibNVk/aFo4TdLrzjGVT5EYN8sDw= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g= -github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70 h1:ayTBJTizOup/LE/oZMUTvvw+w6+52d3+UOzYWMmOqAQ= -github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:CMSHiseYninZM+/cDQ0AT2GVALbvZSYvVXMhSvp1Bfw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 h1:5ixvhVSaz9dEymLhKDqn8JYiClWhnYjtDY3UVvjPg3I= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:saZKt9T5SsoviK6g0vQdgSf2Gk6VjK2NECZ5UHCpmr4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 h1:SyZOmm2G0rFFKfEQbLvt0H7NE65QyrHb36EDIdVY/A0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:cDTppKWhV926JjtdHpS6git534pn4Fd06S23Z6q9+zI= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 h1:cQv3Pdrn7PbcKFh9uqrDnUifdPQeJV6gCg3BDl6h+rk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 h1:TrS8t0UWCuiJcH4UgxnzWIXRxK9htEwBELqW46Hxw0E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:icIR+sy0XffrWMZm0IsdS7pIKljUOn8o3040z0IlEVE= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 h1:fbjedwvTEr1EpdqKCIIAbLhWa7ItgwljRGDWFcLFmSY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 h1:jTaI+rEC4K9ilrOtNtg3IdEtbAfd+uLr+ZAUjsLgmnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 h1:53v/sRSg1Gxnih/A8xERR834UdMCSa9C4Lc09dlPaOc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 h1:CPu6DFs2CKmWAY0gtyReGICWbKGtho1DImHeGmuuq0g= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 h1:aWIOBktXjCp6YALQkO0SUofDQE7+5oRFD8yj9ggEyS8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:aw2R8otz1/3IWKmZwVDvXtU9Cp0dnBXMOYtdpjtor00= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 h1:whezFtMDajwhAD954UWvaPA+6P1k5XwCksG43qOUDX0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:cb2Rq5C4I0+gXg8M+PYuvZndVdIr37Nm1DBe5T5dhDA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 h1:KFVJjlNZ9OLZdRuK4z6j8nU6Bggwi7be8AaUSVBJMqE= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 h1:0sGKARVAoaTiMbpAlD97wdvYI32pUCaXne0LQEKcIzU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 h1:pTcLWizUgcmaodmN3FkWfKlNeDCnYHXaiV5jb8blwJw= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 h1:bKnJcc2UR83qqKUPOXiaYBbqor06PJVW0abI/xgBL6k= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 h1:Ouk+940p0TtXowYdYj4pg+2DlCvn0TjB3Ew7WOfuGRY= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:68PrB9gP9pYKDeGkDR8fZicmzCD/093czqtSVRhJjJg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 h1:gcLcVPahnPopTF0W2E+JeV7DYI9hlqU2LRsYo7H76X8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:OpDY6v8iOpHpLd9PujeMw4sgaAn0PGjNtoOQFI2AIbA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 h1:9CvnLwJFfPwszPMnjOegM1jDImTBfidKQNQBukCz8kI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 h1:ewuDIQ8/v5egwzCnNS3QFgvdIREarthcEHCZ03TvMiU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 h1:+6rbdSMHP4N7n2O1i3XZRMBTAXUJ6/eSgFG+FSGfZig= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 h1:cn2yzwnx1WoqbKt3D7895KJWdXgvg9KTox/76Sz8FFw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 h1:cga0qYrWiawARIYdQ1nCDO/qjlBh2Zw29RFc73yDaZc= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 h1:X1sKZNt9c+2TSjd9hzMuIaQqbNcyP1KlXHepfM1zZ1U= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 h1:kbHXV/t0HXxHNr2wBvrBsYvEu3SSTFP6l4HMeRortxI= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 h1:Qo9619mhvnjS2yjknzl5YxwprtjEsAAYSX7kT102P18= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= +github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd h1:qxkyhBIwr8e2qWsn1jI2wYYx8lTbCPNW3MPgVykw7O0= +github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd/go.mod h1:wqnNgOZkxZc5FGVvgPtMyjxLfYKHpwQvKRvHb0zZAa4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd h1:VF4H9YcfSa1EePZs9Z+bigbgF14L0FxVMqjY76j2P80= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd h1:fCocFew+w3MZDqx0tbWmFP65GUn8M1wn9mv8aFg5mCI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd/go.mod h1:hpAC4eOVaEZZk9tLZ38gAlHF2qwgFI+xcFX+pCjYjJ0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd h1:G76J36LMGlNnOzbUQyiPihqs64A+6qBjN9mNiLgWA1c= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd h1:+1Tq9jIQFtQmzxQY+ARgPn8mzpn/zROKapMNy31kyvk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd/go.mod h1:JC4dA6xOdRtPv8CB8ycP1zRRmgAWtyXWLhjwXKDLt1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd h1:OVWGLOjcLRcKsR3QdhFI2b6j3NnAL3M1ZjqNgls5XYY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd h1:1r+xZ7HqgTE7dUd8YPKAohaE19PMCIKaxaZptwQMHKM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd h1:jD26clcn+b/FCrQRQvZD40EY2XhebBFcGc52xaVXewQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd h1:Aau5aBgS581inQ2m2W1tsRiNZM/UGD+jwi7SJR25ZuU= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230602122057-cc041e853bbd/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd h1:SkA08vp6SxkRsRnQ4i3n3j8oPB5qeJlu8EKV4/yC1+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd h1:REbW4ZV7NPCfjxwMDj1rkNarPbWDpfLhaTO/dzZQAKQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd/go.mod h1:h+VG9kJL2rXABC0yOx5gki+dGMYbadntmeyMviy0sqg= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd h1:sNaWO7WcdfPoffhDY0Q5AgecFGJS7ngqwDRNvkc9sd4= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd h1:XrKapubBf93az3lHYAiLIv2OcB+RqRBKPd24QKZ3MPw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd h1:0FMcIwnUb+E/8OtQRXCpv7C1mBHAJ4cZLLp55PRmWso= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd h1:JIGBoEyVJrHMHTiF/fOs65w9cbUbIg/GL80PmF+lLso= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd h1:+3LVCC2FZQmosd61mHMDA25eSA+jaInhKXrE3SmAMEg= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd/go.mod h1:koRYt7cYiktjZ8iwukGCc5dUVGyOcavTgKH7Kef/70g= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd h1:Vm69X0hMO3EGsO1lr8xQwGgOThCDPiJa6giNP2R425I= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd/go.mod h1:W4G6TQNY6iPvvZM8IEzh9RjNQAARyqvnjXUC/xT3xgE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd h1:uRKhKoevB0GZn0jxKajtMiOwP7G6AzLRGY3LeN8bqhg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd h1:wUVqxlCXFm068nrrsNIavBUjpUboIWQ9jJ4xRBSi9ZM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd h1:3FOe1+gQGajq6Rsez36BhxkeuhhVdZyBHZZ3sCIqbcg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd h1:OKvU+g/Jj5cEQjeyeAL0lgNwlKTcqnlVfaKtICGSiow= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd h1:K0KyglLYclDfFeaF0FZq5Zw4CZK8nZIJRphkD+u9pgI= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd h1:v18X7jYOGeR0+/8M+iI3CFuI5wtueZk28UTG7SAdtIQ= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd h1:uhgbli2idPrDhdMpQzHp9B2hLCwhyHSNOxo0fFc0rxs= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd h1:Q34Jht8Pw3iNHL9W21AFOO+Biq8ebwLRo51nTgzW+vM= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb h1:B1VhZf/XTcInahu7XmosGLDGlKgJHj9eYtNBq+tA2dY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= From 608a0b12f6566d6d52f24c2a24b852e2a6176414 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:16:53 +0000 Subject: [PATCH 4/8] update microshift/vendor --- vendor/modules.txt | 110 ++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 3ec35122eb..3d1265645e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1309,7 +1309,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1366,7 +1366,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/apiextensions-apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1410,7 +1410,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1475,7 +1475,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1633,12 +1633,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1975,7 +1975,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1997,14 +1997,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2038,7 +2038,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/component-helpers v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2051,7 +2051,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/controller-manager v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2068,16 +2068,16 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2096,13 +2096,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kms v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kube-aggregator v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2133,7 +2133,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -2166,13 +2166,13 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2207,7 +2207,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2224,7 +2224,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.27.1 => github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kubernetes v1.27.1 => github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3028,7 +3028,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-20230525170236-15f19ea2dd70 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3070,7 +3070,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-20230525170236-15f19ea2dd70 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3085,10 +3085,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-20230525170236-15f19ea2dd70 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3231,33 +3231,33 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230602122057-cc041e853bbd +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230602122057-cc041e853bbd From d01a52d60a937947721b0fcd00d39af04a9da507 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:16:53 +0000 Subject: [PATCH 5/8] update etcd/go.mod --- etcd/go.mod | 58 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 24 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 78e5eef9ae..96f44068e0 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -143,33 +143,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525170236-15f19ea2dd70 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230602122057-cc041e853bbd // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230602122057-cc041e853bbd // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index 2975da188e..78aab12a80 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -371,18 +371,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:rUkH7z github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:zgNwZ2ZOKkB1bhQFe3tvUqCpMbjqmp4U7kY7oXmuS7c= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 h1:5ixvhVSaz9dEymLhKDqn8JYiClWhnYjtDY3UVvjPg3I= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:saZKt9T5SsoviK6g0vQdgSf2Gk6VjK2NECZ5UHCpmr4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 h1:cQv3Pdrn7PbcKFh9uqrDnUifdPQeJV6gCg3BDl6h+rk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 h1:fbjedwvTEr1EpdqKCIIAbLhWa7ItgwljRGDWFcLFmSY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 h1:jTaI+rEC4K9ilrOtNtg3IdEtbAfd+uLr+ZAUjsLgmnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 h1:aWIOBktXjCp6YALQkO0SUofDQE7+5oRFD8yj9ggEyS8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:aw2R8otz1/3IWKmZwVDvXtU9Cp0dnBXMOYtdpjtor00= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 h1:+6rbdSMHP4N7n2O1i3XZRMBTAXUJ6/eSgFG+FSGfZig= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd h1:VF4H9YcfSa1EePZs9Z+bigbgF14L0FxVMqjY76j2P80= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd h1:G76J36LMGlNnOzbUQyiPihqs64A+6qBjN9mNiLgWA1c= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd h1:OVWGLOjcLRcKsR3QdhFI2b6j3NnAL3M1ZjqNgls5XYY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd h1:1r+xZ7HqgTE7dUd8YPKAohaE19PMCIKaxaZptwQMHKM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd h1:SkA08vp6SxkRsRnQ4i3n3j8oPB5qeJlu8EKV4/yC1+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd h1:3FOe1+gQGajq6Rsez36BhxkeuhhVdZyBHZZ3sCIqbcg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= From e2f3f0196af35ec43c15b0f6fcbbf9c63db1c8b5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:16:58 +0000 Subject: [PATCH 6/8] update etcd/vendor --- .../openshift/microshift/pkg/config/files.go | 1 + .../openshift/microshift/pkg/util/util.go | 16 +++++ etcd/vendor/modules.txt | 72 +++++++++---------- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/files.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/files.go index ffe7ee6d33..ff6fb3af27 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/files.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/files.go @@ -10,6 +10,7 @@ import ( const ( ConfigFile = "/etc/microshift/config.yaml" DataDir = "/var/lib/microshift" + BackupsDir = "/var/lib/microshift-backups" ) func parse(contents []byte) (*Config, error) { diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/util/util.go b/etcd/vendor/github.com/openshift/microshift/pkg/util/util.go index e2ad95c78e..61725b28d2 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/util/util.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/util/util.go @@ -1,7 +1,9 @@ package util import ( + "errors" "fmt" + "os" ) func Must(err error) { @@ -16,3 +18,17 @@ func Default(s string, defaultS string) string { } return s } + +func PathExists(path string) (bool, error) { + if _, err := os.Stat(path); err == nil { + return true, nil + } else if errors.Is(err, os.ErrNotExist) { + return false, nil + } else { + return false, err + } +} + +func MakeDir(path string) error { + return os.MkdirAll(path, 0700) +} diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index c761d836f9..74700807f2 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -197,7 +197,7 @@ github.com/openshift/build-machinery-go/make/targets/openshift github.com/openshift/build-machinery-go/make/targets/openshift/operator github.com/openshift/build-machinery-go/scripts # github.com/openshift/microshift v0.0.0 => ../ -## explicit; go 1.19 +## explicit; go 1.20 github.com/openshift/microshift/pkg/config github.com/openshift/microshift/pkg/config/ovn github.com/openshift/microshift/pkg/util @@ -583,7 +583,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -640,7 +640,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -691,12 +691,12 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -842,7 +842,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -879,7 +879,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1006,32 +1006,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230525170236-15f19ea2dd70 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230525170236-15f19ea2dd70 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230602122057-cc041e853bbd +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230602122057-cc041e853bbd +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230602122057-cc041e853bbd From 507e50c2a2662b39ffd045f273f5520d396e4172 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:16:59 +0000 Subject: [PATCH 7/8] 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 684dad5ea3..a1934b42f1 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:2d528ad0718d847c8ceb3137eb2e46d1d4f5c7f55035988cb05cbf82a825e2a4" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1ea92a17b839c922f89950f7016035bfe7848d349f359efa90fd05d96011aa" 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 73c2b9b93a..909586b2b4 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:bf5de561238db5394abdacaffb04687db7fb8745c8ea679f65fc09000949a677" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ced9ae0ec0058f6f7ecb83e958f3b158d9ed99a3663c7e2188dc69dbd8779c" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From ecf9f2d99ebd6c8d5f7e7ace8047d4862b21ead1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 5 Jun 2023 05:17:01 +0000 Subject: [PATCH 8/8] rebase.sh failure artifacts --- .../openshift-dns/dns/daemonset.yaml | 157 ++-- .../components/openshift-dns/dns/service.yaml | 35 +- .../node-resolver/daemonset.yaml | 140 ---- .../openshift-router/deployment.yaml | 123 +--- .../openshift-router/service-internal.yaml | 32 +- assets/release/release-aarch64.json | 16 +- assets/release/release-x86_64.json | 16 +- rebase_sh.log | 689 ++++++++++++++++++ 8 files changed, 832 insertions(+), 376 deletions(-) delete mode 100644 assets/components/openshift-dns/node-resolver/daemonset.yaml create mode 100644 rebase_sh.log diff --git a/assets/components/openshift-dns/dns/daemonset.yaml b/assets/components/openshift-dns/dns/daemonset.yaml index fa1fa220a7..314ced9cc2 100644 --- a/assets/components/openshift-dns/dns/daemonset.yaml +++ b/assets/components/openshift-dns/dns/daemonset.yaml @@ -1,5 +1,6 @@ kind: DaemonSet apiVersion: apps/v1 +# name, namespace and labels are set at runtime spec: # minReadySeconds should be 3x the readiness probe's polling interval (i.e. periodSeconds). minReadySeconds: 9 @@ -7,90 +8,82 @@ spec: metadata: annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - dns.operator.openshift.io/daemonset-dns: default spec: serviceAccountName: dns priorityClassName: system-node-critical containers: - - name: dns - imagePullPolicy: IfNotPresent - terminationMessagePolicy: FallbackToLogsOnError - command: ["coredns"] - args: ["-conf", "/etc/coredns/Corefile"] - volumeMounts: - - name: config-volume - mountPath: /etc/coredns - readOnly: true - ports: - - containerPort: 5353 - name: dns - protocol: UDP - - containerPort: 5353 - name: dns-tcp - protocol: TCP - readinessProbe: - httpGet: - path: /ready - port: 8181 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value! - successThreshold: 1 - failureThreshold: 3 - timeoutSeconds: 3 - livenessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - resources: - requests: - cpu: 50m - memory: 70Mi - image: '{{ .ReleaseImage.coredns }}' - - name: kube-rbac-proxy - args: - - --logtostderr - - --secure-listen-address=:9154 - - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - - --upstream=http://127.0.0.1:9153/ - - --tls-cert-file=/etc/tls/private/tls.crt - - --tls-private-key-file=/etc/tls/private/tls.key - ports: - - containerPort: 9154 - name: metrics - resources: - requests: - cpu: 10m - memory: 40Mi - volumeMounts: - - mountPath: /etc/tls/private - name: metrics-tls - readOnly: true - image: '{{ .ReleaseImage.kube_rbac_proxy }}' - imagePullPolicy: IfNotPresent + - name: dns + # image is set at runtime + imagePullPolicy: IfNotPresent + terminationMessagePolicy: FallbackToLogsOnError + command: [ "coredns" ] + args: [ "-conf", "/etc/coredns/Corefile" ] + volumeMounts: + - name: config-volume + mountPath: /etc/coredns + readOnly: true + ports: + - containerPort: 5353 + name: dns + protocol: UDP + - containerPort: 5353 + name: dns-tcp + protocol: TCP + readinessProbe: + httpGet: + path: /ready + port: 8181 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value! + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 + livenessProbe: + httpGet: + path: /health + port: 8080 + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + resources: + requests: + cpu: 50m + memory: 70Mi + - name: kube-rbac-proxy + # image is set at runtime + args: + - --logtostderr + - --secure-listen-address=:9154 + - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 + - --upstream=http://127.0.0.1:9153/ + - --tls-cert-file=/etc/tls/private/tls.crt + - --tls-private-key-file=/etc/tls/private/tls.key + ports: + - containerPort: 9154 + name: metrics + resources: + requests: + cpu: 10m + memory: 40Mi + volumeMounts: + - mountPath: /etc/tls/private + name: metrics-tls + readOnly: true dnsPolicy: Default + # nodeSelector is set at runtime. volumes: - - name: config-volume - configMap: - items: - - key: Corefile - path: Corefile - name: dns-default - - name: metrics-tls - secret: - defaultMode: 420 - secretName: dns-default-metrics-tls - nodeSelector: - kubernetes.io/os: linux - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists + - name: config-volume + configMap: + # Name is set at runtime + items: + - key: Corefile + path: Corefile + - name: metrics-tls + # secretName is set at runtime + # tolerations is set at runtime. updateStrategy: type: RollingUpdate rollingUpdate: @@ -102,11 +95,3 @@ spec: maxSurge: 10% # maxUnavailable must be zero when maxSurge is nonzero. maxUnavailable: 0 - selector: - matchLabels: - dns.operator.openshift.io/daemonset-dns: default -metadata: - name: dns-default - namespace: openshift-dns - labels: - dns.operator.openshift.io/owning-dns: default diff --git a/assets/components/openshift-dns/dns/service.yaml b/assets/components/openshift-dns/dns/service.yaml index 3849d98bce..0dca87150b 100644 --- a/assets/components/openshift-dns/dns/service.yaml +++ b/assets/components/openshift-dns/dns/service.yaml @@ -1,24 +1,19 @@ kind: Service apiVersion: v1 +# name, namespace,labels and annotations are set at runtime spec: + # clusterIP will be automatically managed. + # selector is set at runtime ports: - - name: dns - port: 53 - targetPort: dns - protocol: UDP - - name: dns-tcp - port: 53 - targetPort: dns-tcp - protocol: TCP - - name: metrics - port: 9154 - targetPort: metrics - protocol: TCP - clusterIP: '{{.ClusterIP}}' - selector: - dns.operator.openshift.io/daemonset-dns: default -metadata: - annotations: - service.beta.openshift.io/serving-cert-secret-name: dns-default-metrics-tls - name: dns-default - namespace: openshift-dns + - name: dns + port: 53 + targetPort: dns + protocol: UDP + - name: dns-tcp + port: 53 + targetPort: dns-tcp + protocol: TCP + - name: metrics + port: 9154 + targetPort: metrics + protocol: TCP diff --git a/assets/components/openshift-dns/node-resolver/daemonset.yaml b/assets/components/openshift-dns/node-resolver/daemonset.yaml deleted file mode 100644 index 6d8a5fbf32..0000000000 --- a/assets/components/openshift-dns/node-resolver/daemonset.yaml +++ /dev/null @@ -1,140 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: node-resolver - namespace: openshift-dns -spec: - revisionHistoryLimit: 10 - selector: - matchLabels: - dns.operator.openshift.io/daemonset-node-resolver: "" - template: - metadata: - annotations: - target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - dns.operator.openshift.io/daemonset-node-resolver: "" - spec: - containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -uo pipefail - - trap 'jobs -p | xargs kill || true; wait; exit 0' TERM - - NAMESERVER=${DNS_DEFAULT_SERVICE_HOST} - OPENSHIFT_MARKER="openshift-generated-node-resolver" - HOSTS_FILE="/etc/hosts" - TEMP_FILE="/etc/hosts.tmp" - - IFS=', ' read -r -a services <<< "${SERVICES}" - - # Make a temporary file with the old hosts file's attributes. - if ! cp -f --attributes-only "${HOSTS_FILE}" "${TEMP_FILE}"; then - echo "Failed to preserve hosts file. Exiting." - exit 1 - fi - - while true; do - declare -A svc_ips - for svc in "${services[@]}"; do - # Fetch service IP from cluster dns if present. We make several tries - # to do it: IPv4, IPv6, IPv4 over TCP and IPv6 over TCP. The two last ones - # are for deployments with Kuryr on older OpenStack (OSP13) - those do not - # support UDP loadbalancers and require reaching DNS through TCP. - cmds=('dig -t A @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t AAAA @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t A +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t AAAA +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"') - for i in ${!cmds[*]} - do - ips=($(eval "${cmds[i]}")) - if [[ "$?" -eq 0 && "${#ips[@]}" -ne 0 ]]; then - svc_ips["${svc}"]="${ips[@]}" - break - fi - done - done - - # Update /etc/hosts only if we get valid service IPs - # We will not update /etc/hosts when there is coredns service outage or api unavailability - # Stale entries could exist in /etc/hosts if the service is deleted - if [[ -n "${svc_ips[*]-}" ]]; then - # Build a new hosts file from /etc/hosts with our custom entries filtered out - if ! sed --silent "/# ${OPENSHIFT_MARKER}/d; w ${TEMP_FILE}" "${HOSTS_FILE}"; then - # Only continue rebuilding the hosts entries if its original content is preserved - sleep 60 & wait - continue - fi - - # Append resolver entries for services - rc=0 - for svc in "${!svc_ips[@]}"; do - for ip in ${svc_ips[${svc}]}; do - echo "${ip} ${svc} ${svc}.${CLUSTER_DOMAIN} # ${OPENSHIFT_MARKER}" >> "${TEMP_FILE}" || rc=$? - done - done - if [[ $rc -ne 0 ]]; then - sleep 60 & wait - continue - fi - - - # TODO: Update /etc/hosts atomically to avoid any inconsistent behavior - # Replace /etc/hosts with our modified version if needed - cmp "${TEMP_FILE}" "${HOSTS_FILE}" || cp -f "${TEMP_FILE}" "${HOSTS_FILE}" - # TEMP_FILE is not removed to avoid file create/delete and attributes copy churn - fi - sleep 60 & wait - unset svc_ips - done - env: - - name: SERVICES - # Comma or space separated list of services - # NOTE: For now, ensure these are relative names; for each relative name, - # an alias with the CLUSTER_DOMAIN suffix will also be added. - value: "image-registry.openshift-image-registry.svc" - - name: NAMESERVER - value: 172.30.0.10 - - name: CLUSTER_DOMAIN - value: cluster.local - image: {{ .ReleaseImage.cli }} - imagePullPolicy: IfNotPresent - name: dns-node-resolver - resources: - requests: - cpu: 5m - memory: 21Mi - securityContext: - privileged: true - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: FallbackToLogsOnError - volumeMounts: - - mountPath: /etc/hosts - name: hosts-file - dnsPolicy: ClusterFirst - hostNetwork: true - nodeSelector: - kubernetes.io/os: linux - priorityClassName: system-node-critical - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - serviceAccount: node-resolver - serviceAccountName: node-resolver - terminationGracePeriodSeconds: 30 - tolerations: - - operator: Exists - volumes: - - hostPath: - path: /etc/hosts - type: File - name: hosts-file - updateStrategy: - rollingUpdate: - maxSurge: 0 - maxUnavailable: 33% - type: RollingUpdate diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml index 3fc5252cac..98edce13cd 100644 --- a/assets/components/openshift-router/deployment.yaml +++ b/assets/components/openshift-router/deployment.yaml @@ -1,67 +1,34 @@ # Deployment with default values +# Ingress Controller specific values are applied at runtime. kind: Deployment apiVersion: apps/v1 +# name and namespace are set at runtime. spec: progressDeadlineSeconds: 600 template: metadata: annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default spec: serviceAccountName: router + # nodeSelector is set at runtime. priorityClassName: system-cluster-critical containers: - name: router + # image is set at runtime. imagePullPolicy: IfNotPresent securityContext: # See https://bugzilla.redhat.com/2007246 allowPrivilegeEscalation: true terminationMessagePolicy: FallbackToLogsOnError + # Merged at runtime. env: - - name: ROUTER_SERVICE_NAMESPACE - value: openshift-ingress - - name: DEFAULT_CERTIFICATE_DIR - value: /etc/pki/tls/private - - name: DEFAULT_DESTINATION_CA_PATH - value: /var/run/configmaps/service-ca/service-ca.crt - - name: STATS_PORT - value: "1936" - - name: RELOAD_INTERVAL - value: 5s - - name: ROUTER_ALLOW_WILDCARD_ROUTES - value: "false" - - name: ROUTER_CANONICAL_HOSTNAME - value: router-default.apps.{{ .BaseDomain }} - - name: ROUTER_CIPHERS - value: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 - - name: ROUTER_CIPHERSUITES - value: TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256 - - name: ROUTER_DISABLE_HTTP2 - value: "true" - - name: ROUTER_DISABLE_NAMESPACE_OWNERSHIP_CHECK - value: "false" - - name: ROUTER_LOAD_BALANCE_ALGORITHM - value: random - - name: ROUTER_METRICS_TYPE - value: haproxy - - name: ROUTER_SERVICE_NAME - value: default - - name: ROUTER_SET_FORWARDED_HEADERS - value: append - - name: ROUTER_TCP_BALANCE_SCHEME - value: source - - name: ROUTER_THREADS - value: "4" - - name: SSL_MIN_VERSION - value: TLSv1.2 - - name: ROUTER_USE_PROXY_PROTOCOL - value: "false" - - name: GRACEFUL_SHUTDOWN_DELAY - value: 1s - - name: ROUTER_DOMAIN - value: apps.{{ .BaseDomain }} + - name: ROUTER_SERVICE_NAMESPACE + value: openshift-ingress + - name: DEFAULT_CERTIFICATE_DIR + value: /etc/pki/tls/private + - name: DEFAULT_DESTINATION_CA_PATH + value: /var/run/configmaps/service-ca/service-ca.crt livenessProbe: httpGet: path: /healthz @@ -82,56 +49,22 @@ spec: cpu: 100m memory: 256Mi volumeMounts: - - mountPath: /etc/pki/tls/private - name: default-certificate - readOnly: true - - mountPath: /var/run/configmaps/service-ca - name: service-ca-bundle - readOnly: true - image: '{{ .ReleaseImage.haproxy_router }}' - ports: - - name: http - containerPort: 80 - protocol: TCP - hostPort: 80 - - name: https - containerPort: 443 - protocol: TCP - hostPort: 443 - - name: metrics - containerPort: 1936 - protocol: TCP - volumes: - - name: default-certificate - secret: - defaultMode: 420 - secretName: router-certs-default - - name: service-ca-bundle - configMap: - items: - - key: service-ca.crt - path: service-ca.crt + - mountPath: /etc/pki/tls/private + name: default-certificate + readOnly: true + - mountPath: /var/run/configmaps/service-ca name: service-ca-bundle - optional: false + readOnly: true + volumes: + - name: default-certificate + secret: defaultMode: 420 - restartPolicy: Always - terminationGracePeriodSeconds: 3600 - dnsPolicy: ClusterFirst - nodeSelector: - kubernetes.io/os: linux - node-role.kubernetes.io/worker: "" - serviceAccount: router - securityContext: {} - schedulerName: default-scheduler - minReadySeconds: 30 - selector: - matchLabels: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default - replicas: 1 - strategy: - type: Recreate -metadata: - name: router-default - namespace: openshift-ingress - labels: - ingresscontroller.operator.openshift.io/owning-ingresscontroller: default + # SecretName is set at run-time. + - name: service-ca-bundle + configMap: + items: + - key: service-ca.crt + path: service-ca.crt + name: service-ca-bundle + optional: false + defaultMode: 420 diff --git a/assets/components/openshift-router/service-internal.yaml b/assets/components/openshift-router/service-internal.yaml index 79868ea550..675e9d274e 100644 --- a/assets/components/openshift-router/service-internal.yaml +++ b/assets/components/openshift-router/service-internal.yaml @@ -2,25 +2,19 @@ # Ingress Controller specific annotations are applied at runtime. kind: Service apiVersion: v1 +# name, namespace and annotations are set at runtime. spec: type: ClusterIP ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - - name: https - port: 443 - protocol: TCP - targetPort: https - - name: metrics - port: 1936 - protocol: TCP - targetPort: metrics - selector: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default -metadata: - labels: - ingresscontroller.operator.openshift.io/owning-ingresscontroller: default - name: router-internal-default - namespace: openshift-ingress + - name: http + port: 80 + protocol: TCP + targetPort: http + - name: https + port: 443 + protocol: TCP + targetPort: https + - name: metrics + port: 1936 + protocol: TCP + targetPort: metrics diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 821dff10c8..7c6ed97d94 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-ec.1" + "base": "4.14.0-0.nightly-arm64-2023-06-04-192121" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5aae06a0a08fa282caf16bea2edfb6ea1563c32df06cd310de443f690936ed03", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4e9d055dfe72422f8178aa8a028d71f4f0c1724c97ab889ec11aaeedf9ca320", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bf2bed81d16afc7fa62e261e3ceefe62b0c2572af115e95058d3d000159a60f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb7d055d6b386eb5a9e2244e6bd6e233968c748b1d6776fab6b06a695572c399", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e381a2cc59632fe5f30fa0081af005a9319711e33a3da22833b9f10aa1acd483", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08e1448760627a193fdce0cccc1f01c516555b890d9ddb816bb11704bd657040", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a8d975f56fbc66cc81c83247929f4efed54a9fe674a69508c665881743cf81f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb4624ae6ca43927a96a0c45c14ea5653f9efefe0c68461a312c11993314de2", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3db7fc2e06a52e7f1438247b50a2328ab9dad5793e66753f8c3dd2c3394ab05", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf5de561238db5394abdacaffb04687db7fb8745c8ea679f65fc09000949a677", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88e1098f18b1a82c2a3f741f27621fc99875f1ac51a741d47a2bcafd9bc14ec2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:771d3089075769224171eee4a9bf4d60b8567398b31776606d163953c2588972", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ced9ae0ec0058f6f7ecb83e958f3b158d9ed99a3663c7e2188dc69dbd8779c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18d52f0a34b818b2245398ba6b9003bbb320e8c4c36bd18db3f4399746a4b698", "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 529628e27f..e30e1c4429 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-ec.1" + "base": "4.14.0-0.nightly-2023-06-04-233932" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b7910b51cba486ff90439027ce4cbacbdd0f784460bedbf764b538b2e8c1397", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd5f22e812a592cb182ff60f64d4d0c0a35f044ce8be8c15be30bc0472b64024", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81f4f8ba81f066238edbf440b5450cfacdc163dbddf7b41b1889a65cc6eb5701", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:014cf1d1b17794ca550a80ce944666188cd3117f6dafb84d1107fa9bc108c82b", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8c2f14fc5a2544a086fd0e500dda8292261ce481f8d477b40160f2b170c49bc", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d666db9fefcd003c718fe603e88a6b2c121cb7c4e684a0578788229b34280d42", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18f6e02a8e826391b46349871700d53f858666a9b6d9cd03ee56fa7353a57b9a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a95f62b191c4cb58eafe74fcef2fef4d1ffc31b40c10aa7bc6c89822a4016779", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97ccaf3f7e0d31dfb3018e7a7c78ba93ad156420e7d9092e8b0921a0602cd2a1", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d528ad0718d847c8ceb3137eb2e46d1d4f5c7f55035988cb05cbf82a825e2a4", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9d199c1fc8ead5293f91489cc6c6f906570943cb5df31a2e97fb1d943865bbe", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0d73ba49f856fb5f28bc60e8d1b014b0a45bce66c5f9ea9dc5b83ce4f2472ce", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1ea92a17b839c922f89950f7016035bfe7848d349f359efa90fd05d96011aa", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee80a539310fe3dcbd379bc0e07f6df9fdaeb601effb592abc10fd5db0093f67", "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/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..0364314447 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,689 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-04-192121 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-04-192121 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 8d84af3 Merge pull request #368 from gcs278/k8s-1.27-bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at b2af379 Merge pull request #939 from rfredette/ocpbugs-9464-take2 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 0afbcf1 Merge pull request #1505 from ingvagabund/sync-library-go + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 1e15498 Merge pull request #739 from ingvagabund/sync-library-go + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at f42458c Merge pull request #485 from ingvagabund/test-libary-go-perm-change + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at 6c0b42e Merge pull request #1822 from jparrill/bug/safeEvict + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 2628fef Merge pull request #292 from lance5890/add_loglevel_controller + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at cc787e1 Merge pull request #115 from atiratree/bug-13649-cluster-resource-quotas-fix-count + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 53cdd6b0 Merge pull request #184 from openshift-cherrypick-robot/cherry-pick-177-to-openshift-4.14 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at cc041e853 Merge pull request #1594 from harche/4.15_cadvisor + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at 5843b7a4 Merge pull request #3713 from jkyros/ocpbugs-13860 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 41104bf Merge pull request #261 from coreydaley/kubernetes_0.27 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at 38d9ec8 Merge pull request #25 from DennisPeriquet/revert-22-use-library-go + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at f0bd313 Merge pull request #211 from s-urbaniak/pr-209 + +# Cloning registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-04-233932 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 60caade Merge pull request #1415 from prb112/OCPBUGS-12793 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at a2c62dd Merge pull request #92 from gcs278/CVE-2022-41723 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at ec0a69f Merge pull request #486 from gcs278/k8s-1.27 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at 27c2555 Merge pull request #66 from openshift-bot/art-consistency-openshift-4.14-kube-rbac-proxy + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at 8adae67 Merge pull request #1683 from tssurya/lb-templates-merge-downstream + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at cc041e853 Merge pull request #1594 from harche/4.15_cadvisor + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at f0bd313 Merge pull request #211 from s-urbaniak/pr-209 + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at 60caade Merge pull request #1415 from prb112/OCPBUGS-12793 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at a2c62dd Merge pull request #92 from gcs278/CVE-2022-41723 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at ec0a69f Merge pull request #486 from gcs278/k8s-1.27 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at 27c2555 Merge pull request #66 from openshift-bot/art-consistency-openshift-4.14-kube-rbac-proxy + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at 8adae67 Merge pull request #1683 from tssurya/lb-templates-merge-downstream + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at cc041e853 Merge pull request #1594 from harche/4.15_cadvisor + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at f0bd313 Merge pull request #211 from s-urbaniak/pr-209 + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +downloading LVMS operator bundles +/go/src/github.com/openshift/microshift/_output/staging/lvms/amd64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "amd64" architecture +/go/src/github.com/openshift/microshift +/go/src/github.com/openshift/microshift/_output/staging/lvms/arm64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "arm64" architecture +/go/src/github.com/openshift/microshift +error: branch 'rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04' not found. +Switched to a new branch 'rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 5e9942ae] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-dns-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +etcd embedded-component no change + +machine-config-operator embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +coredns image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +coredns image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 3637cbcc] update changelog + 2 files changed, 96 insertions(+), 16 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@cc787e1b1e177696817b66689a03471914083a67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/spf13/cobra v1.7.0 +go: downloading k8s.io/klog/v2 v2.100.1 +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading github.com/stretchr/testify v1.8.1 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/api v0.0.0-20230516201849-333bc194ef7a +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17 +go: downloading github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb +go: downloading github.com/openshift/route-controller-manager v0.0.0-20230524200047-38d9ec83ce46 +go: downloading go.etcd.io/etcd/client/pkg/v3 v3.5.7 +go: downloading go.etcd.io/etcd/client/v3 v3.5.7 +go: downloading golang.org/x/sys v0.8.0 +go: downloading github.com/openshift/kubernetes v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/google/go-cmp v0.5.9 +go: downloading k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230525170236-15f19ea2dd70 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading github.com/go-logr/logr v1.2.4 +go: downloading github.com/inconshreveable/mousetrap v1.1.0 +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading github.com/google/uuid v1.3.0 +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading k8s.io/utils v0.0.0-20230505201702-9f6742963106 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/google/gofuzz v1.2.0 +go: downloading github.com/jonboulle/clockwork v0.2.2 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.2.3 +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.0 +go: downloading github.com/russross/blackfriday/v2 v2.1.0 +go: downloading github.com/imdario/mergo v0.3.11 +go: downloading golang.org/x/term v0.8.0 +go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +go: downloading golang.org/x/net v0.10.0 +go: downloading golang.org/x/crypto v0.1.0 +go: downloading golang.org/x/sync v0.1.0 +go: downloading go.uber.org/zap v1.19.0 +go: downloading go.etcd.io/etcd/api/v3 v3.5.7 +go: downloading google.golang.org/grpc v1.51.0 +go: downloading github.com/vishvananda/netns v0.0.2 +go: downloading sigs.k8s.io/kube-storage-version-migrator v0.0.4 +go: downloading go.opentelemetry.io/otel/trace v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/coreos/go-systemd/v22 v22.4.0 +go: downloading github.com/google/cadvisor v0.47.1 +go: downloading github.com/opencontainers/runc v1.1.6 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 +go: downloading go.opentelemetry.io/otel/sdk v1.10.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 +go: downloading go.opentelemetry.io/otel v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/fsnotify/fsnotify v1.6.0 +go: downloading sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading github.com/google/gnostic v0.5.7-v3refs +go: downloading golang.org/x/text v0.9.0 +go: downloading sigs.k8s.io/kustomize/api v0.13.2 +go: downloading sigs.k8s.io/kustomize/kyaml v0.14.1 +go: downloading github.com/golang/protobuf v1.5.3 +go: downloading google.golang.org/protobuf v1.28.1 +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 +go: downloading github.com/onsi/gomega v1.27.4 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading github.com/moby/term v0.0.0-20221205130635-1aeaba878587 +go: downloading golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/prometheus/client_golang v1.14.0 +go: downloading github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.9.0 +go: downloading github.com/emicklei/go-restful/v3 v3.9.0 +go: downloading go.uber.org/atomic v1.7.0 +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/blang/semver v3.5.1+incompatible +go: downloading github.com/prometheus/client_model v0.3.0 +go: downloading github.com/prometheus/procfs v0.8.0 +go: downloading github.com/prometheus/common v0.37.0 +go: downloading go.uber.org/multierr v1.6.0 +go: downloading go.uber.org/goleak v1.2.1 +go: downloading github.com/coreos/go-semver v0.3.0 +go: downloading github.com/onsi/ginkgo v1.11.0 +go: downloading google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 +go: downloading github.com/benbjohnson/clock v1.1.0 +go: downloading k8s.io/gengo v0.0.0-20220902162205-c0856e24416d +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.0.0 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230503174907-d9b2bf6185e9 +go: downloading gopkg.in/square/go-jose.v2 v2.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/Azure/azure-sdk-for-go v55.0.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/adal v0.9.20 +go: downloading github.com/Azure/go-autorest/autorest v0.11.27 +go: downloading github.com/Azure/go-autorest v14.2.0+incompatible +go: downloading github.com/cyphar/filepath-securejoin v0.2.3 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230525170236-15f19ea2dd70 +go: downloading go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 +go: downloading go.opentelemetry.io/proto/otlp v0.19.0 +go: downloading github.com/golang/mock v1.6.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 +go: downloading github.com/Microsoft/go-winio v0.4.17 +go: downloading github.com/container-storage-interface/spec v1.7.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading github.com/go-logr/zapr v1.2.3 +go: downloading github.com/go-openapi/swag v0.22.3 +go: downloading github.com/go-openapi/jsonreference v0.20.1 +go: downloading github.com/fvbommel/sortorder v1.0.1 +go: downloading github.com/google/btree v1.0.1 +go: downloading github.com/kr/pretty v0.3.0 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/creack/pty v1.1.18 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.2 +go: downloading github.com/google/cel-go v0.12.6 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.1.2 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.2 +go: downloading golang.org/x/tools v0.7.0 +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/mitchellh/mapstructure v1.4.1 +go: downloading github.com/felixge/httpsnoop v1.0.3 +go: downloading go.opentelemetry.io/otel/metric v0.31.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230525170236-15f19ea2dd70 +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 +go: downloading github.com/BurntSushi/toml v0.3.1 +go: downloading github.com/hashicorp/golang-lru v0.5.1 +go: downloading go.etcd.io/etcd/server/v3 v3.5.7 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading github.com/docker/distribution v2.8.1+incompatible +go: downloading github.com/coreos/go-oidc v2.1.0+incompatible +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +go: downloading cloud.google.com/go v0.97.0 +go: downloading github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading google.golang.org/api v0.60.0 +go: downloading gopkg.in/gcfg.v1 v1.2.0 +go: downloading github.com/vmware/govmomi v0.30.0 +go: downloading github.com/Azure/go-autorest/autorest/date v0.3.0 +go: downloading github.com/Azure/go-autorest/tracing v0.6.0 +go: downloading github.com/Azure/go-autorest/logger v0.2.1 +go: downloading github.com/golang-jwt/jwt/v4 v4.4.2 +go: downloading github.com/Azure/go-autorest/autorest/mocks v0.4.2 +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/Microsoft/hcsshim v0.8.25 +go: downloading github.com/cenkalti/backoff/v4 v4.1.3 +go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/godbus/dbus/v5 v5.0.6 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.10.0 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/containerd/ttrpc v1.1.0 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/mailru/easyjson v0.7.7 +go: downloading github.com/go-errors/errors v1.4.2 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/go-openapi/jsonpointer v0.19.6 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/kr/text v0.2.0 +go: downloading github.com/rogpeppe/go-internal v1.10.0 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading github.com/pquerna/cachecontrol v0.1.0 +go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 +go: downloading go.etcd.io/bbolt v1.3.6 +go: downloading go.etcd.io/etcd/pkg/v3 v3.5.7 +go: downloading gopkg.in/warnings.v0 v0.1.1 +go: downloading github.com/stretchr/objx v0.5.0 +go: downloading github.com/checkpoint-restore/go-criu/v5 v5.3.0 +go: downloading github.com/containerd/console v1.0.3 +go: downloading github.com/mrunalp/fileutils v0.5.0 +go: downloading github.com/docker/docker v20.10.21+incompatible +go: downloading github.com/docker/go-connections v0.4.0 +go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 +go: downloading github.com/xlab/treeprint v1.1.0 +go: downloading github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 +go: downloading github.com/josharian/intern v1.0.0 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 +go: downloading github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 +go: downloading golang.org/x/mod v0.9.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/gorilla/websocket v1.4.2 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.7 +go: downloading github.com/dustin/go-humanize v1.0.0 +go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 +go: downloading github.com/googleapis/gax-go/v2 v2.1.1 +go: downloading go.opencensus.io v0.23.0 +go: downloading github.com/moby/ipvs v1.1.0 +go: downloading github.com/golang/glog v1.0.0 +go: downloading github.com/cilium/ebpf v0.7.0 +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.4 +go: downloading go.etcd.io/etcd/client/v2 v2.305.7 +go: downloading github.com/containerd/cgroups v1.0.1 +go: downloading github.com/frankban/quicktest v1.11.3 +go: downloading go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 +go: downloading github.com/Azure/go-autorest/autorest/to v0.4.0 +go: downloading github.com/Azure/go-autorest/autorest/validation v0.1.0 +go: downloading github.com/dnaeon/go-vcr v1.2.0 +go: downloading github.com/gofrs/uuid v4.0.0+incompatible +go mod edit -require github.com/openshift/route-controller-manager@38d9ec83ce464e9198af05918ab03a7995a11866 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@cc041e853bbd41b7b675d3563c445d01336bda33 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20230317131656-c62d9de5a460 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230602122057-cc041e853bbd +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230602122057-cc041e853bbd +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@cc787e1b1e177696817b66689a03471914083a67 +go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f +go: downloading github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 +go: downloading github.com/cockroachdb/errors v1.2.4 +go: downloading github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f +go: downloading github.com/getsentry/raven-go v0.2.0 +go: downloading github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 +go mod edit -require github.com/openshift/route-controller-manager@38d9ec83ce464e9198af05918ab03a7995a11866 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230602122057-cc041e853bbd +skipping modulepath github.com/openshift/microshift: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/config: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/util/cryptomaterial: no or unknown command [] +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20230317131656-c62d9de5a460 +go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@53cdd6b0519f0e57da9032b473465799bba4b1a0 +go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20230323125716-53cdd6b0519f +go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20230323125716-53cdd6b0519f +go mod edit -replace go.etcd.io/etcd/pkg/v3=github.com/openshift/etcd/pkg/v3@v3.5.1-0.20230323125716-53cdd6b0519f +go mod edit -replace go.etcd.io/etcd/raft/v3=github.com/openshift/etcd/raft/v3@v3.5.1-0.20230323125716-53cdd6b0519f +go mod edit -replace go.etcd.io/etcd/server/v3=github.com/openshift/etcd/server/v3@v3.5.1-0.20230323125716-53cdd6b0519f +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230602122057-cc041e853bbd +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230602122057-cc041e853bbd +## Committing changes to microshift/go.mod +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 e2d88ecf] update microshift/go.mod + 2 files changed, 81 insertions(+), 81 deletions(-) +## Updating microshift/vendor directory +go mod vendor +for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply --reject || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Checking patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go... +Applied patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 33 (offset 1 line). +Hunk #3 succeeded at 86 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 26 (offset 1 line). +Hunk #3 succeeded at 50 (offset 1 line). +Hunk #4 succeeded at 109 (offset 2 lines). +Hunk #5 succeeded at 127 (offset 2 lines). +Hunk #6 succeeded at 141 (offset 2 lines). +Hunk #7 succeeded at 157 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch +Checking patch vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go... +Hunk #1 succeeded at 172 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch +Checking patch vendor/k8s.io/klog/v2/goroutine_labels.go... +Checking patch vendor/k8s.io/klog/v2/internal/buffer/buffer.go... +Hunk #1 succeeded at 139 (offset -10 lines). +Checking patch vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go... +Applied patch vendor/k8s.io/klog/v2/goroutine_labels.go cleanly. +Applied patch vendor/k8s.io/klog/v2/internal/buffer/buffer.go cleanly. +Applied patch vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch +Checking patch vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go... +Applied patch vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go cleanly. +## Commiting changes to microshift/vendor directory +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 608a0b12] update microshift/vendor + 1 file changed, 55 insertions(+), 55 deletions(-) +## Committing changes to etcd/go.mod +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 d01a52d6] update etcd/go.mod + 2 files changed, 41 insertions(+), 41 deletions(-) +## Updating etcd/vendor directory +go mod vendor +## Commiting changes to etcd/vendor directory +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 e2f3f019] update etcd/vendor + 3 files changed, 53 insertions(+), 36 deletions(-) +Rebasing release_*.json +/go/src/github.com/openshift/microshift/_output/staging/lvms /go/src/github.com/openshift/microshift +/go/src/github.com/openshift/microshift +## Committing changes to pkg/release +[rebase-4.14.0-0.nightly-2023-06-04-233932_amd64-2023-06-04_arm64-2023-06-04 507e50c2] update component images + 2 files changed, 2 insertions(+), 2 deletions(-) +Copying manifests +2023-06-05 05:16:59,900 INFO Clearing directory assets/components/openshift-dns/dns/ +2023-06-05 05:16:59,901 DEBUG Copying assets/components/openshift-dns/dns/cluster-role-binding.yaml <- _output/staging/cluster-dns-operator/assets/dns/cluster-role-binding.yaml +2023-06-05 05:16:59,902 DEBUG Copying assets/components/openshift-dns/dns/cluster-role.yaml <- _output/staging/cluster-dns-operator/assets/dns/cluster-role.yaml +2023-06-05 05:16:59,903 INFO Restoring assets/components/openshift-dns/dns/configmap.yaml +2023-06-05 05:16:59,903 DEBUG Executing 'git restore assets/components/openshift-dns/dns/configmap.yaml' +2023-06-05 05:16:59,932 DEBUG Copying assets/components/openshift-dns/dns/daemonset.yaml <- _output/staging/cluster-dns-operator/assets/dns/daemonset.yaml +2023-06-05 05:16:59,933 DEBUG Copying assets/components/openshift-dns/dns/namespace.yaml <- _output/staging/cluster-dns-operator/assets/dns/namespace.yaml +2023-06-05 05:16:59,935 DEBUG Copying assets/components/openshift-dns/dns/service-account.yaml <- _output/staging/cluster-dns-operator/assets/dns/service-account.yaml +2023-06-05 05:16:59,935 DEBUG Copying assets/components/openshift-dns/dns/service.yaml <- _output/staging/cluster-dns-operator/assets/dns/service.yaml +2023-06-05 05:16:59,936 INFO Clearing directory assets/components/openshift-dns/node-resolver +2023-06-05 05:16:59,937 WARNING Ignoring components/openshift-dns/node-resolver/daemonset.yaml because it's created by processing daemonset.yaml.tmpl +2023-06-05 05:16:59,937 INFO Restoring assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl +2023-06-05 05:16:59,937 DEBUG Executing 'git restore assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl' +2023-06-05 05:16:59,965 DEBUG Copying assets/components/openshift-dns/node-resolver/service-account.yaml <- _output/staging/cluster-dns-operator/assets/node-resolver/service-account.yaml +2023-06-05 05:16:59,967 DEBUG Copying assets/components/openshift-dns/node-resolver/update-node-resolver.sh <- _output/staging/cluster-dns-operator/assets/node-resolver/update-node-resolver.sh +2023-06-05 05:16:59,968 INFO Clearing directory assets/components/openshift-router/ +2023-06-05 05:16:59,969 DEBUG Copying assets/components/openshift-router/cluster-role-binding.yaml <- _output/staging/cluster-ingress-operator/assets/router/cluster-role-binding.yaml +2023-06-05 05:16:59,971 DEBUG Copying assets/components/openshift-router/cluster-role.yaml <- _output/staging/cluster-ingress-operator/assets/router/cluster-role.yaml +2023-06-05 05:16:59,972 INFO Restoring assets/components/openshift-router/configmap.yaml +2023-06-05 05:16:59,973 DEBUG Executing 'git restore assets/components/openshift-router/configmap.yaml' +2023-06-05 05:17:00,001 DEBUG Copying assets/components/openshift-router/deployment.yaml <- _output/staging/cluster-ingress-operator/assets/router/deployment.yaml +2023-06-05 05:17:00,002 DEBUG Copying assets/components/openshift-router/namespace.yaml <- _output/staging/cluster-ingress-operator/assets/router/namespace.yaml +2023-06-05 05:17:00,003 DEBUG Copying assets/components/openshift-router/service-account.yaml <- _output/staging/cluster-ingress-operator/assets/router/service-account.yaml +2023-06-05 05:17:00,004 DEBUG Copying assets/components/openshift-router/service-internal.yaml <- _output/staging/cluster-ingress-operator/assets/router/service-internal.yaml +2023-06-05 05:17:00,005 INFO Restoring assets/components/openshift-router/serving-certificate.yaml +2023-06-05 05:17:00,005 DEBUG Executing 'git restore assets/components/openshift-router/serving-certificate.yaml' +2023-06-05 05:17:00,037 INFO Not clearing dir components/lvms/ +2023-06-05 05:17:00,037 DEBUG Copying assets/components/lvms/topolvm-controller-resizer_rbac.authorization.k8s.io_v1_clusterrole.yaml <- _output/staging/lvms/amd64/topolvm-controller-resizer_rbac.authorization.k8s.io_v1_clusterrole.yaml +Traceback (most recent call last): + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 156, in + main() + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 149, in main + handle_dir(asset) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 127, in handle_dir + handle_file(file, dst, new_src_prefix) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 110, in handle_file + copy(src, dst) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 70, in copy + shutil.copyfile(src, dst) + File "/usr/lib64/python3.9/shutil.py", line 264, in copyfile + with open(src, 'rb') as fsrc: +FileNotFoundError: [Errno 2] No such file or directory: '_output/staging/lvms/amd64/topolvm-controller-resizer_rbac.authorization.k8s.io_v1_clusterrole.yaml' +Script exited with error.