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

deploy/Makefile

@@ -41,17 +41,28 @@ CI_REPO_PFX=registry.gitlab.com/uplex/varnish/k8s-ingress/varnish-ingress
 ifeq ($(TEST),local)
 	VARNISH_IMAGE=varnish-ingress/$(VARNISH)
 	VARNISH_TAG=latest
+	HAPROXY_IMAGE=varnish-ingress/haproxy
+	HAPROXY_TAG=latest
 else ifeq ($(TEST),ci)
 	VARNISH_IMAGE=$(CI_REPO_PFX)/$(VARNISH)
 	VARNISH_TAG=master
+	HAPROXY_IMAGE=$(CI_REPO_PFX)/haproxy
+	HAPROXY_TAG=master
 endif
 
 # If not specified, pull the latest "official" images from dockerhub.
+LATEST=0.0.2
 ifndef VARNISH_IMAGE
 	VARNISH_IMAGE=uplex/viking-$(VARNISH)
 endif
 ifndef VARNISH_TAG
-	VARNISH_TAG=0.0.2
+	VARNISH_TAG=$(LATEST)
+endif
+ifndef HAPROXY_IMAGE
+	HAPROXY_IMAGE=uplex/viking-haproxy
+endif
+ifndef HAPROXY_TAG
+	HAPROXY_TAG=$(LATEST)
 endif
 
 ifndef WAIT_TIMEOUT
@@ -68,7 +79,9 @@ deploy-service-helm:
 	@helm install viking-service $(mkdir)/../charts/viking-service \
 		--values values-varnish.yaml \
 		--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
-		--set vikingService.varnish.image.tag=$(VARNISH_TAG)
+		--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
+		--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
+		--set vikingService.haproxy.image.tag=$(HAPROXY_TAG)
 
 # TESTOPTS are passed to varnishtest, e.g.: make TESTOPTS=-v verify
 verify:

deploy/values-varnish.yaml

@@ -4,11 +4,6 @@ vikingService:
   varnish:
     extraArgs: []
 
-  haproxy:
-    image:
-      repository: varnish-ingress/haproxy
-      tag: "latest"
-
   ## Name of the ingress class to route through this controller
   ##
   ingressClass: varnish