Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Migrate to Golang 1.14 #31

Merged
merged 1 commit into from
Jun 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion VERSION_VSI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.1
6.1.0
10 changes: 8 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
82 changes: 3 additions & 79 deletions go.sum

Large diffs are not rendered by default.

133 changes: 0 additions & 133 deletions vendor/golang.org/x/text/unicode/bidi/gen.go

This file was deleted.

57 changes: 0 additions & 57 deletions vendor/golang.org/x/text/unicode/bidi/gen_ranges.go

This file was deleted.

64 changes: 0 additions & 64 deletions vendor/golang.org/x/text/unicode/bidi/gen_trieval.go

This file was deleted.

Loading