diff --git a/build/dev-env.sh b/build/dev-env.sh index d98f0bfbd..b2e504b15 100755 --- a/build/dev-env.sh +++ b/build/dev-env.sh @@ -51,7 +51,7 @@ if [[ ${HELM_VERSION} < "v3.0.0" ]]; then exit 1 fi -KUBE_CLIENT_VERSION=$(kubectl version --client --short | awk '{print $3}' | cut -d. -f2) || true +KUBE_CLIENT_VERSION=$(kubectl version --client --short 2>/dev/null | grep Client | awk '{print $3}' | cut -d. -f2) || true if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then echo "Please update kubectl to 1.15 or higher" exit 1 diff --git a/test/e2e-image/Makefile b/test/e2e-image/Makefile index f35c5db5b..0e28e091c 100644 --- a/test/e2e-image/Makefile +++ b/test/e2e-image/Makefile @@ -2,7 +2,10 @@ DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) image: + echo "..entered Makefile in /test/e2e-image" + echo "..calling Make target <>y in /Makefile from inside /test/e2e-image/Makefile" make -C $(DIR)/../../ e2e-test-binary + echo "..done building e2e-test-binary from /test/e2e-image/Makefile" cp $(DIR)/../e2e/e2e.test . cp $(DIR)/../e2e/wait-for-nginx.sh . @@ -19,4 +22,4 @@ clean: docker rmi -f nginx-ingress-controller:e2e || true -.PHONY: image clean \ No newline at end of file +.PHONY: image clean