Replace helm undeploy scripts with Makefile scripting.

deploy/Makefile

@@ -42,10 +42,16 @@ verify:
 	$(mkdir)/verify.sh
 
 undeploy-service-helm:
-	$(mkdir)/undeploy_helm.sh
+	@helm uninstall viking-service
+	@echo Waiting for viking-service Pods to be deleted
+	@kubectl wait pod --timeout=2m \
+		-l app.kubernetes.io/name=varnish-ingress --for=delete
 
 undeploy-controller-helm:
-	$(mkdir)/clear_helm.sh
+	@helm uninstall viking-controller --namespace kube-system
+	@echo Waiting for viking-controller Pod to be deleted
+	@kubectl wait pod --timeout=2m -n kube-system \
+		-l app.kubernetes.io/name=viking-controller --for=delete
 
 deploy-helm: deploy-controller-helm deploy-service-helm
 

deploy/clear_helm.sh

-#! /bin/bash -ex
-
-helm uninstall viking-controller --namespace kube-system
-
-kubectl wait --timeout=2m pod -n kube-system -l app=varnish-ingress-controller \
-        --for=delete

deploy/undeploy_helm.sh

-#! /bin/bash -ex
-
-MYDIR=$(dirname ${BASH_SOURCE[0]})
-source ${MYDIR}/../test/utils.sh
-
-helm uninstall viking-service
-
-echo Waiting until varnish-ingress Pods are deleted
-wait_until_deleted app=varnish-ingress