Migrate to Golang 1.14 (#31)

Talend · Jun 3, 2020 · cc889a0 · cc889a0
1 parent 0038e84
commit cc889a0
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 1,457 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Default Vault image set to `1.4.2` to fix several CVEs (CVE-2020-13223, CVE-2020
 **Changed**
 
 - [VSI #29](https://github.com/Talend/vault-sidecar-injector/pull/29) - Update HashiCorp Vault image to 1.4.2
+- [VSI #31](https://github.com/Talend/vault-sidecar-injector/pull/31) - Migrate to Golang 1.14
 
 ## Release v6.1.0 - 2020-05-18
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12.9 AS buildTVSI
+FROM golang:1.14.4 AS buildTVSI
 
 COPY . /vaultsidecarinjector
 RUN cd /vaultsidecarinjector && make build

diff --git a/Makefile b/Makefile
@@ -26,15 +26,22 @@ fmt:
 	gofmt -l -w $(SRC)
 
 test: # for detailed outputs, run 'make test VERBOSE=true'
-	echo "Running tests (for detailed outputs, run 'make test VERBOSE=true') ..."
-	go test -v ./...
+	if [ -z ${OFFLINE} ] || [ ${OFFLINE} != true ];then \
+		echo "Running tests ..."; \
+		echo ">> for detailed outputs, run 'make test VERBOSE=true' <<"; \
+		go test -mod=mod -v ./...; \
+	else \
+		echo "Running tests using local vendor folder (ie offline build) ..."; \
+		echo ">> for detailed outputs, run 'make test VERBOSE=true' <<"; \
+		go test -mod=vendor -v ./...; \
+	fi
 
 build: clean test # run 'make build OFFLINE=true' to build from vendor folder
 	if [ -z ${OFFLINE} ] || [ ${OFFLINE} != true ];then \
 		echo "Building ..."; \
-		GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -a -o $(TARGET); \
+		GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -mod=mod -a -o $(TARGET); \
 	else \
-		echo "Building using local vendor folder (ie offline build)..."; \
+		echo "Building using local vendor folder (ie offline build) ..."; \
 		GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -mod=vendor -a -o $(TARGET); \
 	fi
 	cd target && sha512sum vaultinjector-webhook > vaultinjector-webhook.sha512

diff --git a/README.md b/README.md
@@ -848,7 +848,7 @@ Just run following command:
 $ make image
 ```
 
-> Note: if you have Go installed on your machine, you can use `make image-from-build` instead.
+> Note: if you have Go installed on your machine, you can use `make image-from-build` instead. You need Golang 1.14 or higher.
 
 </details>
 

diff --git a/VERSION_VSI b/VERSION_VSI
@@ -1 +1 @@
-6.0.1
+6.1.0
diff --git a/go.mod b/go.mod
@@ -1,17 +1,23 @@
 module talend/vault-sidecar-injector
 
-go 1.12
+go 1.14
 
 require (
 	github.com/ghodss/yaml v1.0.0
+	github.com/gogo/protobuf v1.2.1 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
 	github.com/json-iterator/go v1.1.5 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
 	github.com/prometheus/client_golang v0.9.3
-	github.com/spf13/viper v1.4.0 // indirect
+	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.3.0
+	golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/inf.v0 v0.9.0 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
 	k8s.io/api v0.0.0-20190116205037-c89978d5f86d
 	k8s.io/apimachinery v0.0.0-20190116203031-d49e237a2683
 	k8s.io/klog v0.2.0

diff --git a/go.sum b/go.sum
diff --git a/vendor/golang.org/x/text/unicode/bidi/gen.go b/vendor/golang.org/x/text/unicode/bidi/gen.go
diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go b/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go
diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go b/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go