Fix CI script for the varnish/klarlack variation.

.gitlab-ci.yml

@@ -15,13 +15,16 @@ push_to_docker:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish:$CI_COMMIT_REF_NAME
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_REF_NAME
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME uplex/viking-haproxy:$CI_COMMIT_TAG
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/varnish:$CI_COMMIT_REF_NAME uplex/viking-varnish:$CI_COMMIT_TAG
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME uplex/viking-varnish:$CI_COMMIT_TAG
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_REF_NAME uplex/viking-controller:$CI_COMMIT_TAG
     - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_CREDS"
     - docker push uplex/viking-haproxy:$CI_COMMIT_TAG
     - docker push uplex/viking-varnish:$CI_COMMIT_TAG
+    - docker push uplex/viking-klarlack:$CI_COMMIT_TAG
     - docker push uplex/viking-controller:$CI_COMMIT_TAG
 
 test:
@@ -288,12 +291,12 @@ example:file-cache:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA
     # using haproxy and varnish image with latest tag due to performance. if we are changing this image a lot, we need to improve this as can lead to pulling the incorrect image
-    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/$VARNISH:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA varnish-ingress/controller
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME varnish-ingress/haproxy
-    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME varnish-ingress/varnish
-    - kind load docker-image varnish-ingress/varnish
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/$VARNISH:$CI_COMMIT_REF_NAME varnish-ingress/$VARNISH
+    - kind load docker-image varnish-ingress/$VARNISH
     - kind load docker-image varnish-ingress/haproxy
     - kind load docker-image varnish-ingress/controller
     - cd deploy