ISSUE-147 - Upgrade k8s dependencies

- upgrade to k8s 1.17.5 deps - upgrade to operator-sdk 0.17 - upgrade controller-runtime to 0.5.2
pravega · Jun 10, 2020 · ce60485 · ce60485
1 parent 273a51c
commit ce60485
Show file tree

Hide file tree

Showing 5 changed files with 1,129 additions and 296 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ SHELL=/bin/bash -o pipefail
 PROJECT_NAME=zookeeper-operator
 EXPORTER_NAME=zookeeper-exporter
 APP_NAME=zookeeper
+KUBE_VERSION=1.17.5
 REPO=pravega/$(PROJECT_NAME)
 TEST_REPO=$(DOCKER_USER)/$(PROJECT_NAME)
 APP_REPO=pravega/$(APP_NAME)
@@ -94,3 +95,6 @@ check-format:
 
 check-license:
 	./scripts/check_license.sh
+
+update-kube-version:
+	./scripts/update_kube_version.sh ${KUBE_VERSION}
diff --git a/go.mod b/go.mod
@@ -3,110 +3,66 @@ module github.com/pravega/zookeeper-operator
 go 1.13
 
 require (
-	4d63.com/gochecknoglobals v0.0.0-20190306162314-7c3491d2b6ec // indirect
-	4d63.com/gochecknoinits v0.0.0-20200108094044-eb73b47b9fc4 // indirect
-	cloud.google.com/go v0.55.0
-	github.com/PuerkitoBio/purell v1.1.1
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
-	github.com/alecthomas/gocyclo v0.0.0-20150208221726-aa8f8b160214 // indirect
-	github.com/alexkohler/nakedret v1.0.0 // indirect
-	github.com/beorn7/perks v1.0.1
-	github.com/davecgh/go-spew v1.1.1
-	github.com/emicklei/go-restful v2.12.0+incompatible
-	github.com/fsnotify/fsnotify v1.4.9
-	github.com/ghodss/yaml v1.0.0
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-logr/logr v0.1.0
-	github.com/go-logr/zapr v0.1.1
-	github.com/go-openapi/jsonpointer v0.19.3
-	github.com/go-openapi/jsonreference v0.19.3
-	github.com/go-openapi/spec v0.19.7
-	github.com/go-openapi/swag v0.19.8
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
-	github.com/golang/protobuf v1.3.5
-	github.com/google/btree v1.0.0
-	github.com/google/gofuzz v1.1.0
-	github.com/google/uuid v1.1.1
-	github.com/googleapis/gnostic v0.4.0
-	github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf // indirect
-	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
-	github.com/hashicorp/golang-lru v0.5.4
-	github.com/hpcloud/tail v1.0.0
-	github.com/imdario/mergo v0.3.8
-	github.com/jgautheron/goconst v0.0.0-20200227150835-cda7ea3bf591 // indirect
-	github.com/json-iterator/go v1.1.9
-	github.com/mailru/easyjson v0.7.1
-	github.com/markbates/inflect v1.0.4 // indirect
-	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
-	github.com/matttproud/golang_protobuf_extensions v1.0.1
-	github.com/mdempsky/maligned v0.0.0-20180708014732-6e39bd26a8c8 // indirect
-	github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f // indirect
-	github.com/mibk/dupl v1.0.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
-	github.com/modern-go/reflect2 v1.0.1
 	github.com/onsi/ginkgo v1.12.0
 	github.com/onsi/gomega v1.9.0
-	github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff // indirect
-	github.com/operator-framework/operator-sdk v0.3.0
-	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709
-	github.com/petar/GoLLRB v0.0.0-20190514000832-33fb24c13b99
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/operator-framework/operator-sdk v0.17.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.0.0
-	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.9.1
-	github.com/prometheus/procfs v0.0.11
 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
-	github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/pflag v1.0.5
-	github.com/walle/lll v1.0.1 // indirect
-	go.uber.org/atomic v1.6.0
-	go.uber.org/multierr v1.5.0
-	go.uber.org/zap v1.14.1
-	golang.org/x/crypto v0.0.0-20200320181102-891825fb96df
-	golang.org/x/mod v0.2.0
-	golang.org/x/net v0.0.0-20200320220750-118fecf932d8
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sys v0.0.0-20200320181252-af34d8274f85
-	golang.org/x/text v0.3.2
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
-	google.golang.org/appengine v1.6.5
-	gopkg.in/inf.v0 v0.9.1
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
-	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0-20181126151915-b503174bad59
-	k8s.io/apiextensions-apiserver v0.0.0-00010101000000-000000000000 // indirect
-	k8s.io/apimachinery v0.0.0-20181126123746-eddba98df674
-	k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c
-	k8s.io/code-generator v0.0.0-20180823001027-3dcf91f64f63
-	k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12
-	k8s.io/klog v1.0.0
-	k8s.io/kube-openapi v0.0.0-20200204173128-addea2498afe
-	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
-	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
-	mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 // indirect
-	sigs.k8s.io/controller-runtime v0.1.8
+	k8s.io/api v0.17.5
+	k8s.io/apimachinery v0.17.5
+	k8s.io/client-go v12.0.0+incompatible
+	k8s.io/kubernetes v1.17.5 // indirect
+	sigs.k8s.io/controller-runtime v0.5.2
 )
 
-replace (
-	k8s.io/api => k8s.io/api v0.0.0-20190528110122-9ad12a4af326
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190528110544-fa58353d80f3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190528110248-2d60c3dee270
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190528110732-ad79ea2fbc0f
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190528110200-4f3abb12cae2
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931
-	k8s.io/gengo => k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190528110328-0ab90e449f7e
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190528111014-463e5d26aa13
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190528110839-96abc4c8d1a4
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190528110942-86bc7e94eb9a
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190528110910-f5f997cd2103
-	k8s.io/kubernetes => k8s.io/kubernetes v1.12.9
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20190528110627-05eb8901940c
-)
+replace k8s.io/api => k8s.io/api v0.17.5
+
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.5
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.17.6-beta.0
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.17.5
+
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.5
+
+replace k8s.io/client-go => k8s.io/client-go v0.17.5
+
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.5
+
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.5
+
+replace k8s.io/code-generator => k8s.io/code-generator v0.17.6-beta.0
+
+replace k8s.io/component-base => k8s.io/component-base v0.17.5
+
+replace k8s.io/cri-api => k8s.io/cri-api v0.17.7-rc.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.5
+
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.5
+
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.5
+
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.5
+
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.5
+
+replace k8s.io/kubectl => k8s.io/kubectl v0.17.5
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.17.5
+
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.5
+
+replace k8s.io/metrics => k8s.io/metrics v0.17.5
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.5
+
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.5
+
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.5
+
+replace k8s.io/node-api => k8s.io/node-api v0.17.5
+
+replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm