Use make variables to specify the controller image for helm deployment.

deploy/Makefile

@@ -39,11 +39,15 @@ CI_REPO_PFX=registry.gitlab.com/uplex/varnish/k8s-ingress/varnish-ingress
 # For tests using the local docker registry: make TEST=local ...
 # For tests using images from the CI pipeline: make TEST=ci ...
 ifeq ($(TEST),local)
+	CONTROLLER_IMAGE=varnish-ingress/controller
+	CONTROLLER_TAG=latest
 	VARNISH_IMAGE=varnish-ingress/$(VARNISH)
 	VARNISH_TAG=latest
 	HAPROXY_IMAGE=varnish-ingress/haproxy
 	HAPROXY_TAG=latest
 else ifeq ($(TEST),ci)
+	CONTROLLER_IMAGE=$(CI_REPO_PFX)/controller
+	CONTROLLER_TAG=master
 	VARNISH_IMAGE=$(CI_REPO_PFX)/$(VARNISH)
 	VARNISH_TAG=master
 	HAPROXY_IMAGE=$(CI_REPO_PFX)/haproxy
@@ -52,6 +56,12 @@ endif
 
 # If not specified, pull the latest "official" images from dockerhub.
 LATEST=0.0.2
+ifndef CONTROLLER_IMAGE
+	CONTROLLER_IMAGE=uplex/viking-controller
+endif
+ifndef CONTROLLER_TAG
+	CONTROLLER_TAG=$(LATEST)
+endif
 ifndef VARNISH_IMAGE
 	VARNISH_IMAGE=uplex/viking-$(VARNISH)
 endif
@@ -73,7 +83,9 @@ all: deploy-helm
 
 deploy-controller-helm:
 	@helm install viking-controller $(mkdir)/../charts/viking-controller \
-		--values values-controller.yaml --namespace kube-system
+		--values values-controller.yaml --namespace kube-system \
+		--set vikingController.image.repository=$(CONTROLLER_IMAGE) \
+		--set vikingController.image.tag=$(CONTROLLER_TAG)
 
 deploy-service-helm:
 	@helm install viking-service $(mkdir)/../charts/viking-service \
@@ -95,7 +107,7 @@ undeploy-service-helm:
 
 undeploy-controller-helm:
 	@helm uninstall viking-controller --namespace kube-system
-	@echo Waiting for viking-controller Pod to be deleted
+	@echo Waiting for the viking-controller Pod to be deleted
 	@kubectl wait pod --timeout=$(WAIT_TIMEOUT) -n kube-system \
 		-l app.kubernetes.io/name=viking-controller --for=delete
 

deploy/values-controller.yaml

 vikingController:
-  image:
-    repository: varnish-ingress/controller
-    tag: "latest"
 
   ## Name of the ingress class to route through this controller
   ##