Merge remote-tracking branch 'upstream/master'

Makefile

@@ -24,7 +24,7 @@ ifndef VERBOSE
 endif
 
 # set default shell
-SHELL=/bin/bash -o pipefail
+SHELL=/bin/bash -o pipefail -o errexit
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG ?= 0.29.0
@@ -154,7 +154,7 @@ endif
 
 .PHONY: clean
 clean: ## Remove .gocache directory.
-	rm -rf bin/ .gocache/
+	rm -rf bin/ .gocache/ .cache/
 
 .PHONY: static-check
 static-check: ## Run verification script for boilerplate, codegen, gofmt, golint and lualint.
@@ -195,7 +195,7 @@ e2e-test: check-go-version ## Run e2e tests (expects access to a working Kuberne
 	@build/run-e2e-suite.sh
 
 .PHONY: e2e-test-image
-e2e-test-image: e2e-test-binary ## Build image for e2e tests.
+e2e-test-image: ## Build image for e2e tests.
 	@make -C test/e2e-image
 
 .PHONY: e2e-test-binary
@@ -207,6 +207,11 @@ else
 	@ginkgo build ./test/e2e
 endif
 
+.PHONY: print-e2e-suite
+print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e tests.
+	@build/run-in-docker.sh \
+		hack/print-e2e-suite.sh
+
 .PHONY: cover
 cover: check-go-version ## Run go coverage unit tests.
 	@build/cover.sh

build/dev-env.sh

@@ -24,7 +24,7 @@ set -o pipefail
 
 DIR=$(cd $(dirname "${BASH_SOURCE}") && pwd -P)
 
-export TAG=dev
+export TAG=0.0.0-dev
 export ARCH=amd64
 export REGISTRY=${REGISTRY:-ingress-controller}