Merge pull request operator-framework#805 from njhale/fix-modules

Fix modules

.gitignore

@@ -326,18 +326,6 @@ publish/
 # in these scripts will be unencrypted
 PublishScripts/
 
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
 # Microsoft Azure Build Output
 csx/
 *.build.csdef

Makefile

@@ -13,8 +13,8 @@ counterfeiter := $(GOBIN)/counterfeiter
 mockgen := $(GOBIN)/mockgen
 IMAGE_REPO := quay.io/operator-framework/olm
 IMAGE_TAG ?= "dev"
-KUBE_DEPS := api apiextensions-apiserver apimachinery code-generator kube-aggregator kubernetes
-KUBE_RELEASE := release-1.11
+KUBE_DEPS := api apiserver apimachinery apiextensions-apiserver kube-aggregator code-generator
+KUBE_RELEASE := release-1.12
 
 .PHONY: build test run clean vendor schema-check \
 	vendor-update coverage coverage-html e2e .FORCE
@@ -93,6 +93,7 @@ e2e-local-docker:
 # 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)

go.mod

@@ -1,70 +1,68 @@
 module github.com/operator-framework/operator-lifecycle-manager
 
+go 1.12
+
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
-	github.com/coreos/bbolt v1.3.2 // indirect
 	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-20190204112023-081494f7ee4f // indirect
+	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v1.13.1 // indirect
-	github.com/emicklei/go-restful v2.9.0+incompatible // indirect
-	github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+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/ghodss/yaml v1.0.0
-	github.com/go-openapi/spec v0.17.2
-	github.com/go-openapi/strfmt v0.19.0 // indirect
-	github.com/go-openapi/validate v0.19.0 // indirect
+	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/loads v0.17.2 // indirect
+	github.com/go-openapi/runtime v0.17.2 // indirect
+	github.com/go-openapi/spec v0.19.0
 	github.com/gogo/protobuf v1.2.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/golang/mock v1.1.1
+	github.com/golang/mock v1.2.0
 	github.com/google/btree v1.0.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.7.0 // indirect
+	github.com/google/go-cmp v0.2.0 // indirect
+	github.com/google/gofuzz v1.0.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
 	github.com/json-iterator/go v1.1.6 // indirect
-	github.com/maxbrunsfeld/counterfeiter v0.0.0-20181017030959-1aadac120687
-	github.com/openshift/api v3.9.1-0.20190321190659-71fdeba18656+incompatible
-	github.com/openshift/client-go v0.0.0-20190313214351-8ae2a9c33ba2
-	github.com/operator-framework/operator-registry v1.0.6
-	github.com/pkg/errors v0.8.0
-	github.com/prometheus/client_golang v0.9.1
-	github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f // indirect
-	github.com/prometheus/common v0.2.0 // indirect
-	github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 // indirect
-	github.com/sirupsen/logrus v1.2.0
+	github.com/onsi/ginkgo v1.8.0 // indirect
+	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible
+	github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
+	github.com/operator-framework/operator-registry v1.1.0
+	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
-	go.etcd.io/bbolt v1.3.2 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
-	google.golang.org/grpc v1.16.0
+	golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 // 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-20190118113203-912cbe2bfef3
-	k8s.io/apiextensions-apiserver v0.0.0-20190223021643-57c81b676ab1
-	k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841
-	k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170
-	k8s.io/client-go v8.0.0+incompatible
+	k8s.io/apiextensions-apiserver v0.0.0-20190221101132-cda7b6cfba78
+	k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
+	k8s.io/apiserver v0.0.0-20190402012035-5e1c1f41ee34
+	k8s.io/client-go v11.0.0+incompatible
 	k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3
-	k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 // indirect
+	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
 	k8s.io/klog v0.2.0 // indirect
-	k8s.io/kube-aggregator v0.0.0-20190223015803-f706565beac0
-	k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd
+	k8s.io/kube-aggregator v0.0.0-20190221095344-e77f03c95d65
+	k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
 	k8s.io/kubernetes v1.12.7
+	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
 )
 
 replace (
-	// This is necessary due to the combination of logrus casing changing
-	// without bumping the major version and the extremely old version of
-	// docker that's being pulled in.
-	// original breakage - https://github.com/sirupsen/logrus/issues/451
-	// breakage explanation - https://github.com/golang/go/issues/26208#issuecomment-411955266
-	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.1.0
-	// all of the below are using the kubernetes-1.12.7 tag
-	// remember to bump kubernetes above also when upgrading
-	k8s.io/api => k8s.io/api v0.0.0-20190325144926-266ff08fa05d
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190325151511-42d4d5ce2c84
+	// 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-20190325150012-164c02b49fbe
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190325145348-5392b64e5c0b+incompatible
+	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-20190325150400-0a029fc09217
+	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
 )