diff --git a/.travis.yml b/.travis.yml index 5e0fc1f6..fba98145 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: go -sudo: required env: global: @@ -11,15 +10,15 @@ env: - KUBECONFIG=$HOME/.kube/config go: -- 1.12.x + - 1.13.x matrix: fast_finish: true allow_failures: - - go: master + - go: master before_install: -- make go-dependencies + - make go-dependencies jobs: include: @@ -36,4 +35,4 @@ jobs: cache: directories: - vendor - - /home/travis/.minikube/ \ No newline at end of file + - /home/travis/.minikube/ diff --git a/Makefile b/Makefile index 35e117d6..827418a0 100644 --- a/Makefile +++ b/Makefile @@ -200,10 +200,10 @@ PLATFORM = $(shell echo $(UNAME_S) | tr A-Z a-z) staticcheck: ## Verifies `staticcheck` passes @echo "+ $@" ifndef HAS_STATICCHECK - wget https://github.com/dominikh/go-tools/releases/download/2019.1.1/staticcheck_$(PLATFORM)_amd64 - chmod +x staticcheck_$(PLATFORM)_amd64 + wget -O staticcheck_$(PLATFORM)_amd64.tar.gz https://github.com/dominikh/go-tools/releases/download/2019.2.3/staticcheck_$(PLATFORM)_amd64.tar.gz + tar zxvf staticcheck_$(PLATFORM)_amd64.tar.gz mkdir -p $(GOPATH)/bin - mv staticcheck_$(PLATFORM)_amd64 $(GOPATH)/bin/staticcheck + mv staticcheck/staticcheck $(GOPATH)/bin endif @staticcheck $(PACKAGES) @@ -463,4 +463,4 @@ helm-package: helm-deploy: helm-package @echo "+ $@" helm repo index chart/ --url https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/ - cd chart/ && mv jenkins-operator-*.tgz jenkins-operator \ No newline at end of file + cd chart/ && mv jenkins-operator-*.tgz jenkins-operator diff --git a/config.env b/config.env index 129c622c..53037d69 100644 --- a/config.env +++ b/config.env @@ -1,15 +1,15 @@ # Setup variables for the Makefile NAME=kubernetes-operator OPERATOR_SDK_VERSION=0.10.0 -GO_VERSION=1.12.6 +GO_VERSION=1.13.1 PKG=github.com/jenkinsci/kubernetes-operator DOCKER_ORGANIZATION=virtuslab DOCKER_REGISTRY=jenkins-operator NAMESPACE=default API_VERSION=v1alpha2 -MINIKUBE_KUBERNETES_VERSION=v1.12.9 +MINIKUBE_KUBERNETES_VERSION=v1.16.0 MINIKUBE_DRIVER=virtualbox -MINIKUBE_VERSION=1.2.0 +MINIKUBE_VERSION=1.4.0 KUBECTL_CONTEXT=minikube ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one -GEN_CRD_API=gen-crd-api-reference-docs \ No newline at end of file +GEN_CRD_API=gen-crd-api-reference-docs diff --git a/go.mod b/go.mod index 1338153e..c2d16cd0 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/jenkinsci/kubernetes-operator +go 1.13 + require ( github.com/bndr/gojenkins v0.0.0-20181125150310-de43c03cf849 github.com/docker/distribution v2.7.1+incompatible @@ -21,7 +23,7 @@ require ( golang.org/x/net v0.0.0-20190909003024-a7b16738d86b // indirect golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b // indirect golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578 // indirect + golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e // 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 @@ -48,5 +50,3 @@ replace ( sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10 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 diff --git a/go.sum b/go.sum index 12f607e9..bc3d8a58 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,7 @@ contrib.go.opencensus.io/exporter/ocagent v0.4.9 h1:8ZbMXpyd04/3LILa/9Tzr8N4HzZN contrib.go.opencensus.io/exporter/ocagent v0.4.9/go.mod h1:ueLzZcP7LPhPulEBukGn4aLh7Mx9YJwpVJ9nL2FYltw= contrib.go.opencensus.io/exporter/ocagent v0.4.11 h1:Zwy9skaqR2igcEfSVYDuAsbpa33N0RPtnYTHEe2whPI= contrib.go.opencensus.io/exporter/ocagent v0.4.11/go.mod h1:7ihiYRbdcVfW4m4wlXi9WRPdv79C0fStcjNlyE6ek9s= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v11.1.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -526,6 +527,8 @@ golang.org/x/tools v0.0.0-20190708203411-c8855242db9c h1:rRFNgkkT7zOyWlroLBmsrKY golang.org/x/tools v0.0.0-20190708203411-c8855242db9c/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578 h1:f0Gfd654rnnfXT1+BK1YHPTS1qQdKrPIaGQwWxNE44k= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e h1:1xWUkZQQ9Z9UuZgNaIR6OQOE7rUFglXUUBZlO+dGg6I= +golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=