Automated cherry pick of #247 #101 #287 #288 #293 #285 #299 #301 #304 #267 #305 #306 #326 #323 #322 #327 #330 #329 #346 #338 #313 #300 #296 #347 #295 #344 #235 #361 #365 #345 #343 #325 #336 #321 #371 #364 #378

.goreleaser.yml

@@ -19,6 +19,8 @@ builds:
     goarch:
       - amd64
     flags: -tags netgo
+    hooks:
+      post: hack/minify-binaries.sh
 archive:
   format: binary
 release:

CHANGELOG.md

@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 | Vault       |                    | `0.9.5`  |
 | Kubernetes  | `>= 1.7 && < 1.11` | `1.9.7`  |
 | Calico      |                    | `3.1.1`  |
-| Vault Helper|                    | `0.9.7`  |
+| Vault Helper|                    | `0.9.13` |
 | Etcd        |                    | `3.2.17` |
 
 ## [0.3.0]: 0.3.0 - 2018-02-20

Gopkg.toml

@@ -48,7 +48,7 @@ required = [
 
 [[constraint]]
   name = "github.com/jetstack/vault-helper"
-  version = "0.9.10"
+  version = "0.9.13"
 
 [[constraint]]
   name = "github.com/cenkalti/backoff"
@@ -92,7 +92,7 @@ required = [
 
 [[constraint]]
   name = "github.com/hashicorp/terraform"
-  version = "0.11.5"
+  version = "0.11.7"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-aws"

Makefile

@@ -20,18 +20,18 @@ GOPATH ?= /tmp/go
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
-	SHASUM := "sha256sum -c"
+	SHASUM := sha256sum -c
 	DEP_URL := https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
 	DEP_HASH := 31144e465e52ffbc0035248a10ddea61a09bf28b00784fd3fdd9882c8cbb2315
-	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.54.0/goreleaser_Linux_x86_64.tar.gz
-	GORELEASER_HASH := 895df4293580dd8f9b0daf0ef5456f2238a2fbfc51d9f75dde6e2c63ca4fccc2
+	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.77.0/goreleaser_Linux_x86_64.tar.gz
+	GORELEASER_HASH := aae3c5bb76b282e29940f2654b48b13e51f664368c7589d0e86b391b7ef51cc8
 endif
 ifeq ($(UNAME_S),Darwin)
-	SHASUM := "shasum -a 256 -c"
+	SHASUM := shasum -a 256 -c
 	DEP_URL := https://github.com/golang/dep/releases/download/v0.4.1/dep-darwin-amd64
-	DEP_HASH := f170008e2bf8b196779c361a4eaece1b03450d23bbf32d1a0beaa9b00b6a5ab4
-	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.54.0/goreleaser_Darwin_x86_64.tar.gz
-	GORELEASER_HASH := 9d927528a599174eed4d0d6a1ce6bdc810463c4cb105b0d2319c7c63ec642c9b
+	DEP_HASH := 1544afdd4d543574ef8eabed343d683f7211202a65380f8b32035d07ce0c45ef
+	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.77.0/goreleaser_Darwin_x86_64.tar.gz
+	GORELEASER_HASH := bc6cdf2dfe506f2cce5abceb30da009bfd5bcdb3e52608c536e6c2ceea1f24fe
 endif
 
 
@@ -124,15 +124,29 @@ $(BINDIR)/informer-gen:
 
 $(BINDIR)/dep:
 	curl -sL -o $@ $(DEP_URL)
-	echo "$(DEP_HASH)  $@" | $$SHASUM
+	echo "$(DEP_HASH)  $@" | $(SHASUM)
 	chmod +x $@
 
+# upx binary packer, only supported on Linux
+$(BINDIR)/upx:
+ifeq ($(UNAME_S),Linux)
+	curl -sL -o [email protected] https://github.com/upx/upx/releases/download/v3.94/upx-3.94-amd64_linux.tar.xz
+	echo "e1fc0d55c88865ef758c7e4fabbc439e4b5693b9328d219e0b9b3604186abe20  [email protected]" | $(SHASUM)
+	which xz || ( apt-get update && apt-get -y install xz-utils)
+	cd $(BINDIR) && tar xvf $(shell basename $@).tar.xz upx-3.94-amd64_linux/upx --strip-components=1
+	rm [email protected]
+else
+	echo -e "#/bin/sh\nexit 0" > $@
+	chmod +x $@
+endif
+
 $(BINDIR)/goreleaser:
 	curl -sL -o [email protected] $(GORELEASER_URL)
-	echo "$(GORELEASER_HASH) [email protected]" | $$SHASUM
+	echo "$(GORELEASER_HASH)  [email protected]" | $(SHASUM)
 	cd $(BINDIR) && tar xzvf $(shell basename $@).tar.gz goreleaser
+	rm [email protected]
 
-depend: $(BINDIR)/go-bindata $(BINDIR)/mockgen $(BINDIR)/defaulter-gen $(BINDIR)/defaulter-gen $(BINDIR)/deepcopy-gen $(BINDIR)/conversion-gen $(BINDIR)/client-gen $(BINDIR)/lister-gen $(BINDIR)/informer-gen $(BINDIR)/dep $(BINDIR)/goreleaser
+depend: $(BINDIR)/go-bindata $(BINDIR)/mockgen $(BINDIR)/defaulter-gen $(BINDIR)/defaulter-gen $(BINDIR)/deepcopy-gen $(BINDIR)/conversion-gen $(BINDIR)/client-gen $(BINDIR)/lister-gen $(BINDIR)/informer-gen $(BINDIR)/dep $(BINDIR)/goreleaser $(BINDIR)/upx
 
 go_generate: depend
 	go generate $$(go list ./pkg/... ./cmd/...)

docs/Dockerfile

@@ -1,10 +1,12 @@
 # Copyright Jetstack Ltd. See LICENSE for details.
-FROM python:3
+FROM python:3.6-stretch
 
 WORKDIR /site
 
+# ensure python and dependencies are installed
 RUN apt-get update && apt-get install -y python-enchant wbritish
 
+# install sphinx
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 RUN mkdir -p venv/bin && ln -s $(which python) venv/bin/python && touch .venv

docs/Makefile

@@ -27,13 +27,14 @@ help:
 
 # Make the site's html in docker
 docker_html:
-	set -x; mkdir -p _build; \
-	docker build -t tarmakdocs:latest .; \
-	container=$$(docker create tarmakdocs:latest); \
-	git ls-files -z | xargs -0 tar -czvf - | docker cp - $$container:/site; \
-	docker start -a $$container; \
-	docker cp $$container:/site/_build .; \
-	docker rm $$container
+	# create sphinx image
+	$(eval IMAGE_ID := $(shell docker build -q .))
+	# start documentaion build
+	$(eval CONTAINER_ID := $(shell docker create $(IMAGE_ID)))
+	(git ls-files && git ls-files --others --exclude-standard) | tar cf -  -T - | docker cp - $(CONTAINER_ID):/site
+	docker start -a $(CONTAINER_ID)
+	docker cp $(CONTAINER_ID):/site/_build - | tar xf -
+	docker rm $(CONTAINER_ID)
 
 .venv:
 	virtualenv -p $(shell which python3) $(VENV_PATH)

docs/examples.rst

@@ -0,0 +1,11 @@
+Examples
+========
+
+This section covers extra add-ons you can install on Tarmak kubernetes 
+clusters.
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   examples/*