Merge pull request #954 from njhale/pin-1.14

chore(modules): pin k8s deps to 1.14

Author: openshift-merge-robot

Makefile

@@ -13,8 +13,6 @@ MOCKGEN := ./scripts/generate_mocks.sh
 # mockgen := $(GOBIN)/mockgen
 IMAGE_REPO := quay.io/operator-framework/olm
 IMAGE_TAG ?= "dev"
-KUBE_DEPS := api apiserver apimachinery apiextensions-apiserver kube-aggregator code-generator cli-runtime
-KUBE_RELEASE := release-1.14
 SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
 export GO111MODULE=on
 
@@ -100,13 +98,7 @@ e2e-local-docker:
 	. ./scripts/build_local.sh
 	. ./scripts/run_e2e_docker.sh $(TEST)
 
-# kube dependencies all should be at the same release and should match up with client go
-# go.mod currently doesn't support specifying a branch name to track, and kube isn't publishing good version tags
-$(KUBE_DEPS):
-	go get -m k8s.io/kubernetes@v`echo $(KUBE_RELEASE) | cut -d "-" -f2`
-	go get -m k8s.io/$@@$(KUBE_RELEASE)
-
-vendor: $(KUBE_DEPS)
+vendor:
 	go mod tidy
 	go mod vendor
 

cmd/package-server/main.go

@@ -7,7 +7,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"k8s.io/apiserver/pkg/util/logs"
+	"k8s.io/component-base/logs"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"

go.mod

@@ -2,78 +2,72 @@ module github.com/operator-framework/operator-lifecycle-manager
 
 go 1.12
 
+replace (
+	// Pin openshift version to 4.2 (uses kube 1.14)
+	github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190717200738-0390d1e77d64+incompatible
+	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190627172412-c44a8b61b9f4
+
+	// Pin kube version to 1.14
+	k8s.io/api => k8s.io/api v0.0.0-20190704095032-f4ca3d3bdf1d
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190704104557-6209bbe9f7a9
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190704094733-8f6ac2502e51
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190704101451-e5f5c6e528cd
+	k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190521191137-11646d1007e0+incompatible
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190704094409-6c2a4329ac29
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190704100636-f0322db00a10
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190704101955-e796fd6d55e0
+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
+	k8s.io/kubernetes => k8s.io/kubernetes v1.14.5-beta.0.0.20190708100021-7936da50c68f
+	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
+)
+
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/coreos/etcd v3.3.12+incompatible // indirect
-	github.com/coreos/go-semver v0.2.0
-	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
+	github.com/coreos/go-semver v0.3.0
+	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v0.7.3-0.20190409004836-2e1cfbca03da // indirect
-	github.com/emicklei/go-restful v2.9.3+incompatible // indirect
+	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
+	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
-	github.com/go-openapi/analysis v0.17.2 // indirect
-	github.com/go-openapi/errors v0.17.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.0 // indirect
-	github.com/go-openapi/jsonreference v0.19.0 // indirect
-	github.com/go-openapi/loads v0.17.2 // indirect
-	github.com/go-openapi/runtime v0.17.2 // indirect
-	github.com/go-openapi/spec v0.19.0
-	github.com/go-openapi/swag v0.17.2 // indirect
+	github.com/go-openapi/spec v0.19.2
+	github.com/go-openapi/validate v0.19.2 // indirect
 	github.com/gogo/protobuf v1.2.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333
+	github.com/golang/mock v1.3.1
 	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/google/gofuzz v1.0.0 // indirect
 	github.com/googleapis/gnostic v0.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.9.4 // indirect
 	github.com/json-iterator/go v1.1.6 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/maxbrunsfeld/counterfeiter/v6 v6.0.2
+	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.1
 	github.com/mitchellh/hashstructure v1.0.0
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
-	github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
+	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
+	github.com/openshift/api v0.0.0-00010101000000-000000000000
+	github.com/openshift/client-go v0.0.0-00010101000000-000000000000
 	github.com/operator-framework/operator-registry v1.1.1
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.2
-	github.com/sirupsen/logrus v1.4.1
-	github.com/spf13/cobra v0.0.3
-	github.com/stretchr/testify v1.2.2
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spf13/cobra v0.0.5
+	github.com/stretchr/testify v1.3.0
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/zap v1.10.0 // indirect
-	golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 // indirect
-	golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
-	google.golang.org/appengine v1.5.0 // indirect
-	google.golang.org/grpc v1.19.1
-	gotest.tools v2.2.0+incompatible // indirect
-	k8s.io/api v0.0.0-20190313235455-40a48860b5ab
-	k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
-	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
-	k8s.io/apiserver v0.0.0-20190531031430-24fd0f18bc21
-	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
+	gonum.org/v1/gonum v0.0.0-20190710053202-4340aa3071a0 // indirect
+	google.golang.org/grpc v1.22.0
+	k8s.io/api v0.0.0-20190717022910-653c86b0609b
+	k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc
+	k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
+	k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170
+	k8s.io/client-go v8.0.0+incompatible
+	k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3
+	k8s.io/component-base v0.0.0-20190717023551-b4f50308a616
 	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
-	k8s.io/klog v0.2.0 // indirect
-	k8s.io/kube-aggregator v0.0.0-20190404125450-f5e124c822d6
-	k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
-	k8s.io/kubernetes v1.14.3
-	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
+	k8s.io/kube-aggregator v0.0.0-20181204002017-122bac39d429
+	k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd
+	k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2
+	k8s.io/utils v0.0.0-20190712204705-3dccf664f023 // indirect
+	sigs.k8s.io/structured-merge-diff v0.0.0-00010101000000-000000000000 // indirect
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )
-
-replace (
-	// pin kube dependencies to release-1.12 branch
-	github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550
-	k8s.io/api => k8s.io/api v0.0.0-20181128191700-6db15a15d2d3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221101132-cda7b6cfba78
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190402012035-5e1c1f41ee34
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190228133956-77e032213d34
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190221095344-e77f03c95d65
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
-)