Vendoring (#24)

Talend · Apr 6, 2020 · 10ed5cf · 10ed5cf
1 parent aed81f3
commit 10ed5cf
Show file tree

Hide file tree

Showing 597 changed files with 261,448 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog for Vault Sidecar Injector
 
-## Release v6.0.1 - 2020-04-xx
+## Release v6.0.1 - 2020-04-06
 
-This is a minor release to update Vault image to `1.3.4` by default to benefit from CVE fixes (see details [here](https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#134-march-19th-2020)).
+This is a minor release to update Vault image to `1.3.4` by default (CVE fixes, see details [here](https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#134-march-19th-2020)) and enable offline builds by vendoring dependencies (use `make build OFFLINE=true`).
+
+**Changed**
 
 - [VSI #23](https://github.com/Talend/vault-sidecar-injector/pull/23) - Update HashiCorp Vault image (CVE fixes)
 
+**Added**
+
+- [VSI #24](https://github.com/Talend/vault-sidecar-injector/pull/24) - Vendoring
+
 ## Release v6.0.0 - 2020-03-04
 
 This is a major release introducing new features and complete code refactoring for clear isolation of modes.

diff --git a/Makefile b/Makefile
@@ -25,13 +25,18 @@ clean:
 fmt:
 	gofmt -l -w $(SRC)
 
-test:
+test: # for detailed outputs, run 'make test VERBOSE=true'
 	echo "Running tests ..."
 	go test -v ./...
 
-build: clean test
-	echo "Building ..."
-	GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -a -o $(TARGET)
+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); \
+	else \
+		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
 
 package:

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	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
+	github.com/spf13/viper v1.4.0 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/inf.v0 v0.9.0 // indirect
 	k8s.io/api v0.0.0-20190116205037-c89978d5f86d

diff --git a/vendor/github.com/beorn7/perks/LICENSE b/vendor/github.com/beorn7/perks/LICENSE