Commit c3e8a98a authored by Geoff Simmons's avatar Geoff Simmons

Optionally set the kubectl wait timeout as a make parameter.

This has the consequence that GNU make is required.
parent dd631f30
......@@ -24,9 +24,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# GNU make is required.
mkpath := $(abspath $(lastword $(MAKEFILE_LIST)))
mkdir := $(dir $(mkpath))
ifndef WAIT_TIMEOUT
WAIT_TIMEOUT=2m
endif
all: deploy-helm
deploy-controller-helm:
......@@ -44,13 +50,13 @@ verify:
undeploy-service-helm:
@helm uninstall viking-service
@echo Waiting for viking-service Pods to be deleted
@kubectl wait pod --timeout=2m \
@kubectl wait pod --timeout=$(WAIT_TIMEOUT) \
-l app.kubernetes.io/name=varnish-ingress --for=delete
undeploy-controller-helm:
@helm uninstall viking-controller --namespace kube-system
@echo Waiting for viking-controller Pod to be deleted
@kubectl wait pod --timeout=2m -n kube-system \
@kubectl wait pod --timeout=$(WAIT_TIMEOUT) -n kube-system \
-l app.kubernetes.io/name=viking-controller --for=delete
deploy-helm: deploy-controller-helm deploy-service-helm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment