Wait more carefully for complete undeployment on test runs.

Call helm uninstall with --wait, and where necessary, wait for viking
service pods to be undeployed.

This minimizes errors during the sequential e2e test run -- the
controller may still be working on deletion of the resources of the
previous test when resources of the next test are added.

examples/architectures/cluster-and-ns-wide/Makefile

@@ -30,6 +30,7 @@ mkpath := $(abspath $(lastword $(MAKEFILE_LIST)))
 mkdir := $(dir $(mkpath))
 
 CHARTDIR=$(mkdir)/../../../charts
+TESTDIR=$(mkdir)/../../../test
 
 GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
 
@@ -127,12 +128,13 @@ verify:
 	$(mkdir)/verify.sh
 
 undeploy-helm:
-	@helm uninstall other-ingress --namespace other
-	@helm uninstall tea-ingress --namespace cafe
-	@helm uninstall coffee-ingress --namespace cafe
-	@helm uninstall viking-service-cafe --namespace cafe
-	@helm uninstall viking-service-system --namespace kube-system
+	@helm uninstall --wait other-ingress --namespace other
+	@helm uninstall --wait tea-ingress --namespace cafe
+	@helm uninstall --wait coffee-ingress --namespace cafe
+	@helm uninstall --wait viking-service-cafe --namespace cafe
+	@helm uninstall --wait viking-service-system --namespace kube-system
 	@kubectl delete -f namespace.yaml
+	$(TESTDIR)/wait_delete.sh app=varnish-ingress kube-system
 
 undeploy-kubectl:
 	@kubectl delete -f other-ingress.yaml
@@ -151,6 +153,7 @@ undeploy-kubectl:
 	@kubectl delete -f coffee.yaml
 	@kubectl delete -f rbac.yaml
 	@kubectl delete -f namespace.yaml
+	$(TESTDIR)/wait_delete.sh app=varnish-ingress kube-system
 
 undeploy:
 

examples/architectures/clusterwide/Makefile

@@ -116,10 +116,10 @@ verify:
 	$(mkdir)/verify.sh
 
 undeploy-helm:
-	@helm uninstall other-ingress --namespace other
-	@helm uninstall tea-ingress --namespace tea
-	@helm uninstall coffee-ingress --namespace coffee
-	@helm uninstall viking-service-clusterwide --namespace kube-system
+	@helm uninstall --wait other-ingress --namespace other
+	@helm uninstall --wait tea-ingress --namespace tea
+	@helm uninstall --wait coffee-ingress --namespace coffee
+	@helm uninstall --wait viking-service-clusterwide -n kube-system
 	@kubectl delete -f namespace.yaml
 	$(TESTDIR)/wait_delete.sh app=varnish-ingress kube-system
 

examples/tls/hello/Makefile

@@ -60,7 +60,7 @@ wait:
 	$(TESTDIR)/wait.sh app=varnish-ingress
 
 uninstall-helm:
-	@helm uninstall viking-ingress
+	@helm uninstall --wait viking-ingress
 
 undeploy-helm: uninstall-helm wait
 

test/e2e/changeTLSsecret/Makefile

@@ -53,7 +53,7 @@ wait:
 	$(TESTDIR)/wait.sh app=varnish-ingress
 
 uninstall:
-	@helm uninstall viking-ingress-change-secret
+	@helm uninstall --wait viking-ingress-change-secret
 
 undeploy: uninstall wait
 

test/e2e/deleteTLSsecret/Makefile

@@ -62,7 +62,7 @@ uninstall-kubectl:
 
 uninstall-helm:
 	@kubectl delete -f other-ingress.yaml
-	@helm uninstall viking-ingress-delete-secret
+	@helm uninstall --wait viking-ingress-delete-secret
 
 undeploy-kubectl: uninstall-kubectl wait
 

test/e2e/haproxyTimeout/Makefile

@@ -55,7 +55,7 @@ wait:
 	$(TESTDIR)/wait.sh app=varnish-ingress
 
 uninstall:
-	@helm uninstall haproxy-tmo
+	@helm uninstall --wait haproxy-tmo
 
 undeploy: uninstall wait
 

test/e2e/ingresses/Makefile

@@ -71,7 +71,7 @@ wait:
 	$(TESTDIR)/wait.sh app=varnish-ingress
 
 uninstall:
-	@helm uninstall viking-ingress
+	@helm uninstall --wait viking-ingress
 
 undeploy: uninstall wait
 endif

test/e2e/pathTypes/Makefile

@@ -55,7 +55,7 @@ wait:
 	$(TESTDIR)/wait.sh app=varnish-ingress
 
 uninstall:
-	@helm uninstall viking-ingress-pathtypes
+	@helm uninstall --wait viking-ingress-pathtypes
 
 undeploy: uninstall wait
 endif

test/e2e/probeCfg/Makefile

@@ -112,9 +112,9 @@ verify:
 	$(mkdir)/verify.sh cafe.vtc
 
 undeploy:
-	@helm uninstall --namespace probe-cfg viking-ingress-probe-cfg
-	@helm uninstall --namespace probe-cfg viking-service-probe-cfg
-	@helm uninstall --namespace probe-cfg viking-controller-probe-cfg
+	@helm uninstall --wait --namespace probe-cfg viking-ingress-probe-cfg
+	@helm uninstall --wait --namespace probe-cfg viking-service-probe-cfg
+	@helm uninstall --wait --namespace probe-cfg viking-controller-probe-cfg
 	@kubectl delete -f namespace.yaml
 endif