Bumped the Operator SDK to 0.10.0 (#609)

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

.github/workflows/base-checks.yaml

@@ -6,11 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-      with:
-        path: src/github.com/jaegertracing/jaeger-operator # remove when using operator >= 0.9.0
     - uses: jpkrohling/setup-operator-sdk@v1-release
+      with:
+        operator-sdk-version: v0.10.0
 
     - name: "basic checks"
-      env:
-        GOPATH: /home/runner/work/jaeger-operator #remove when using operator >= 0.9.0
       run: ./.ci/script.sh

.github/workflows/e2e-kubernetes.yaml

@@ -11,9 +11,9 @@ jobs:
     - uses: jpkrohling/setup-minikube@v1-release
     - uses: jpkrohling/setup-kubectl@v1-release
     - uses: jpkrohling/setup-operator-sdk@v1-release
-    - uses: actions/checkout@v1
       with:
-        path: src/github.com/jaegertracing/jaeger-operator # remove when using operator >= 0.9.0
+        operator-sdk-version: v0.10.0
+    - uses: actions/checkout@v1
 
     - name: "setup docker"
       run: ./.ci/setup-docker.sh
@@ -23,7 +23,6 @@ jobs:
 
     - name: "running end to end test"
       env:
-        GOPATH: /home/runner/work/jaeger-operator #remove when using operator >= 0.9.0
         CI: true
         TEST_GROUP: ${{ matrix.TEST_GROUP }}
       run: ./.ci/run-e2e-tests.sh

.github/workflows/e2e-openshift.yaml

@@ -10,9 +10,9 @@ jobs:
     steps:
     - uses: jpkrohling/setup-kubectl@v1-release
     - uses: jpkrohling/setup-operator-sdk@v1-release
-    - uses: actions/checkout@v1
       with:
-        path: src/github.com/jaegertracing/jaeger-operator # remove when using operator >= 0.9.0
+        operator-sdk-version: v0.10.0
+    - uses: actions/checkout@v1
 
     - name: "setup docker"
       run: ./.ci/setup-docker.sh
@@ -25,7 +25,6 @@ jobs:
 
     - name: "running end to end test"
       env:
-        GOPATH: /home/runner/work/jaeger-operator #remove when using operator >= 0.9.0
         CI: true
         TEST_GROUP: ${{ matrix.TEST_GROUP }}
       run: ./.ci/run-e2e-tests.sh

.github/workflows/release.yaml

@@ -9,9 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-      with:
-        path: src/github.com/jaegertracing/jaeger-operator # remove when using operator >= 0.9.0
-
     - name: "perform the release"
       env:
         GH_WRITE_TOKEN: ${{ secrets. GH_WRITE_TOKEN }}

CONTRIBUTING.md

@@ -20,7 +20,7 @@ Follow the installation guidelines from [Operator SDK GitHub page](https://githu
 
 ### Developing
 
-As usual for operators following the Operator SDK, the dependencies are checked into the source repository under the `vendor` directory. The dependencies are managed using [`go dep`](https://github.com/golang/dep). Refer to that project's documentation for instructions on how to add or update dependencies.
+As usual for operators following the Operator SDK in recent versions, the dependencies are managed using [`go modules`](https://golang.org/doc/go1.11#modules). Refer to that project's documentation for instructions on how to add or update dependencies.
 
 The first step is to get a local Kubernetes instance up and running. The recommended approach is using `minikube`. Refer to the Kubernetes'  [documentation](https://kubernetes.io/docs/tasks/tools/install-minikube/) for instructions on how to install it.
 
@@ -60,11 +60,9 @@ make test
 
 NOTE: you can adjust the Docker image namespace by overriding the variable `NAMESPACE`, like: `make test NAMESPACE=quay.io/my-username`. The full Docker image name can be customized by overriding `BUILD_IMAGE` instead, like: `make test BUILD_IMAGE=quay.io/my-username/jaeger-operator:0.0.1`
 
-Similar instructions also work for OpenShift, but the target `run-openshift` can be used instead of `run`. Make sure you are using the `default` namespace or that you are overriding the target namespace by setting `NAMESPACE`, like: `make run-openshift WATCH_NAMESPACE=myproject`
-
 #### Model changes
 
-The Operator SDK generates the `pkg/apis/jaegertracing/v1/zz_generated.deepcopy.go` file via the command `make generate`. This should be executed whenever there's a model change (`pkg/apis/jaegertracing/v1/jaeger_types.go`)
+The Operator SDK generates the `pkg/apis/jaegertracing/v1/zz_generated.*.go` files via the command `make generate`. This should be executed whenever there's a model change (`pkg/apis/jaegertracing/v1/jaeger_types.go`)
 
 #### Ingress configuration
 

Makefile

@@ -18,7 +18,8 @@ KAFKA_NAMESPACE ?= "kafka"
 ES_OPERATOR_NAMESPACE ?= openshift-logging
 ES_OPERATOR_BRANCH ?= release-4.1
 ES_OPERATOR_IMAGE ?= quay.io/openshift/origin-elasticsearch-operator:4.1
-SDK_VERSION=v0.8.1
+SDK_VERSION=v0.10.0
+GOPATH ?= "$(HOME)/go"
 
 LD_FLAGS ?= "-X $(VERSION_PKG).version=$(OPERATOR_VERSION) -X $(VERSION_PKG).buildDate=$(VERSION_DATE) -X $(VERSION_PKG).defaultJaeger=$(JAEGER_VERSION)"
 PACKAGES := $(shell go list ./cmd/... ./pkg/...  ./test/... |  grep -v elasticsearch/v1)

go.mod

@@ -1,77 +1,64 @@
 module github.com/jaegertracing/jaeger-operator
 
 require (
-	cloud.google.com/go v0.36.0 // indirect
-	github.com/Azure/go-autorest/autorest v0.2.0 // indirect
-	github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect
+	github.com/NYTimes/gziphandler v1.0.1 // indirect
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
-	github.com/coreos/prometheus-operator v0.26.0 // indirect
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
-	github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
-	github.com/emicklei/go-restful v2.8.1+incompatible // indirect
-	github.com/evanphx/json-patch v4.1.0+incompatible // indirect
-	github.com/go-logr/logr v0.1.0 // indirect
-	github.com/go-logr/zapr v0.1.0 // indirect
-	github.com/go-openapi/jsonpointer v0.17.2 // indirect
-	github.com/go-openapi/jsonreference v0.17.2 // indirect
-	github.com/go-openapi/spec v0.19.0 // indirect
-	github.com/go-openapi/swag v0.17.2 // indirect
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/uuid v1.0.0 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/googleapis/gnostic v0.2.0
 	github.com/gophercloud/gophercloud v0.1.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/mitchellh/go-homedir v1.0.0
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/kr/pty v1.1.8 // indirect
+	github.com/lib/pq v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/onsi/ginkgo v1.10.1 // indirect
+	github.com/onsi/gomega v1.7.0 // indirect
 	github.com/openshift/api v0.0.0-20180830153656-5ad8479f64f1
 	github.com/opentracing/opentracing-go v1.0.2 // indirect
-	github.com/operator-framework/operator-sdk v0.8.2-0.20190522220659-031d71ef8154
-	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/operator-framework/operator-sdk v0.10.1-0.20190820174346-abac23c897b8
 	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
-	github.com/prometheus/procfs v0.0.0-20190203183350-488faf799f86 // indirect
-	github.com/sirupsen/logrus v1.2.0
-	github.com/spf13/cast v1.3.0 // indirect
+	github.com/securego/gosec v0.0.0-20190904082043-8932f702cecb // indirect
+	github.com/sirupsen/logrus v1.4.1
 	github.com/spf13/cobra v0.0.3
-	github.com/spf13/viper v1.2.1
-	github.com/stretchr/testify v1.3.0
+	github.com/spf13/viper v1.3.2
+	github.com/stretchr/objx v0.2.0 // indirect
+	github.com/stretchr/testify v1.4.0
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/uber/jaeger-client-go v2.15.0+incompatible
 	github.com/uber/jaeger-lib v1.5.0 // indirect
-	go.uber.org/atomic v1.3.2 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.9.1 // indirect
-	golang.org/x/net v0.0.0-20190311183353-d8887717615a
-	k8s.io/api v0.0.0-20190222213804-5cb15d344471
-	k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
-	k8s.io/client-go v0.0.0-20190507014756-65905f29c17c
-	k8s.io/code-generator v0.0.0-20180823001027-3dcf91f64f63
-	k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6
-	k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
-	sigs.k8s.io/controller-runtime v0.1.10
+	golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
+	golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
+	golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
+	golang.org/x/text v0.3.2 // indirect
+	golang.org/x/tools v0.0.0-20190906115428-bc9f4f258ada // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	k8s.io/api v0.0.0-20190612125737-db0771252981
+	k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3
+	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a
+	k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208
+	sigs.k8s.io/controller-runtime v0.1.12
 	sigs.k8s.io/controller-tools v0.1.10
-	sigs.k8s.io/testing_frameworks v0.1.1 // indirect
 )
 
-// Pinned to kubernetes-1.13.1
+// Pinned to kubernetes-1.13.4
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
+	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
 )
 
 replace (
 	github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
+	// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
+	// resolve it correctly.
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.0.0-20190424153033-d3245f150225
+	k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
 	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
+
+replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0