Merge pull request #547 from damemi/oc-4.6-k8s-1.19-rebase

Bug 1874056: Rebase k8s to 1.19.0
openshift · Sep 9, 2020 · 20df740 · 20df740
2 parents 40679be + 4e35f1e
commit 20df740
Show file tree

Hide file tree

Showing 491 changed files with 10,768 additions and 27,901 deletions.
diff --git a/go.mod b/go.mod
@@ -40,10 +40,10 @@ require (
 	github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
 	github.com/mtrmac/gpgme v0.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
-	github.com/openshift/api v0.0.0-20200715151710-c8ebadbe7a0b
-	github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
-	github.com/openshift/client-go v0.0.0-20200715161325-27814304d61b
-	github.com/openshift/library-go v0.0.0-20200629115313-82f0d09841e8
+	github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
+	github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
+	github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
+	github.com/openshift/library-go v0.0.0-20200907120738-ea57b121ba1a
 	github.com/operator-framework/operator-registry v1.8.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.7.1
@@ -55,22 +55,22 @@ require (
 	github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
 	github.com/yvasiyarov/gorelic v0.0.7 // indirect
 	github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
-	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
-	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	gopkg.in/ldap.v2 v2.5.1
-	k8s.io/api v0.19.0-rc.1
-	k8s.io/apimachinery v0.19.0-rc.1
-	k8s.io/apiserver v0.19.0-rc.1
-	k8s.io/cli-runtime v0.19.0-rc.1
-	k8s.io/client-go v0.19.0-rc.1
-	k8s.io/component-base v0.19.0-rc.1
-	k8s.io/klog/v2 v2.2.0
-	k8s.io/kubectl v0.19.0-rc.1
-	k8s.io/kubernetes v1.19.0-rc.1
-	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
+	k8s.io/api v0.19.0
+	k8s.io/apimachinery v0.19.0
+	k8s.io/apiserver v0.19.0
+	k8s.io/cli-runtime v0.19.0
+	k8s.io/client-go v0.19.0
+	k8s.io/component-base v0.19.0
+	k8s.io/klog/v2 v2.3.0
+	k8s.io/kubectl v0.19.0
+	k8s.io/kubernetes v1.19.0
+	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )
@@ -85,35 +85,31 @@ replace (
 	// yet provides the same fix.
 	github.com/docker/docker => github.com/docker/docker v1.4.2-0.20191121165722-d1d5f6476656
 
-	// Temporary prebase rc.1 pins
-	github.com/openshift/api => github.com/openshift/api v0.0.0-20200715151710-c8ebadbe7a0b
-	github.com/openshift/apiserver-library-go => github.com/damemi/apiserver-library-go v0.0.0-20200723152545-74182e2d7efa
-	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200715161325-27814304d61b
-	github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20200724171545-397625153af4
+	github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20200901140731-1236dc23c728
 
-	k8s.io/api => k8s.io/api v0.19.0-rc.1
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.1
-	k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20200715191304-c3ddb877373e
-	k8s.io/apiserver => k8s.io/apiserver v0.19.0-rc.1
-	k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200715191631-9ea65ac700db
-	k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20200724223930-c03ba4fc8674
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.1
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.1
-	k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.1
-	k8s.io/component-base => k8s.io/component-base v0.19.0-rc.1
-	k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.1
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.1
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.1
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.1
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.1
-	k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20200715191849-d24c3ecaf42c
-	k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.1
-	k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200723133814-a8612c131caa
+	k8s.io/api => k8s.io/api v0.19.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
+	k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20200831185207-c0eb43ac4a3e
+	k8s.io/apiserver => k8s.io/apiserver v0.19.0
+	k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200831185531-852eec47b608
+	k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20200908071752-9409de4c95e0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0
+	k8s.io/code-generator => k8s.io/code-generator v0.19.0
+	k8s.io/component-base => k8s.io/component-base v0.19.0
+	k8s.io/cri-api => k8s.io/cri-api v0.19.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0
+	k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20200831185820-c769ddd2f589
+	k8s.io/kubelet => k8s.io/kubelet v0.19.0
+	k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200902150006-fa7747b0a802
 	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.2
-	k8s.io/metrics => k8s.io/metrics v0.19.0-rc.1
-	k8s.io/node-api => k8s.io/node-api v0.19.0-rc.1
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.1
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.0-rc.1
-	k8s.io/sample-controller => k8s.io/sample-controller v0.19.0-rc.1
+	k8s.io/metrics => k8s.io/metrics v0.19.0
+	k8s.io/node-api => k8s.io/node-api v0.19.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.0
+	k8s.io/sample-controller => k8s.io/sample-controller v0.19.0
 )