Run the CI tests with helm deployments.

.gitlab-ci.yml

@@ -112,128 +112,128 @@ example:hello:
   extends: .integration-tests
   script:
     - cd ../examples/hello
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:namespace:
   extends: .integration-tests
   script:
     - cd ../examples/namespace
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:architectures:cluster-and-ns-wide:
   extends: .integration-tests
   script:
     - cd ../examples/architectures/cluster-and-ns-wide
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:architectures:clusterwide:
   extends: .integration-tests
   script:
     - cd ../examples/architectures/clusterwide
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:architectures:multi-controller:
   extends: .integration-tests
   script:
     - cd ../examples/architectures/multi-controller
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:architectures:multi-varnish-ns:
   extends: .integration-tests
   script:
     - cd ../examples/architectures/multi-varnish-ns
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:acl:
   extends: .integration-tests
   script:
     - cd ../examples/acl
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:backend-config:
   extends: .integration-tests
   script:
     - cd ../examples/backend-config
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:custom-vcl:
   extends: .integration-tests
   script:
     - cd ../examples/custom-vcl
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:rewrite:
   extends: .integration-tests
   script:
     - cd ../examples/rewrite
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:self-sharding:
   extends: .integration-tests
   script:
     - cd ../examples/self-sharding
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:authentication:basic:
   extends: .integration-tests
   script:
     - cd ../examples/authentication
-    - make DEPLOY=kubectl EXAMPLE=basic-auth deploy verify undeploy
+    - make EXAMPLE=basic-auth deploy verify undeploy
 
 example:authentication:acl-or-auth:
   extends: .integration-tests
   script:
     - cd ../examples/authentication
-    - make DEPLOY=kubectl EXAMPLE=acl-or-auth deploy verify undeploy
+    - make EXAMPLE=acl-or-auth deploy verify undeploy
 
 example:authentication:proxy:
   extends: .integration-tests
   script:
     - cd ../examples/authentication
-    - make DEPLOY=kubectl EXAMPLE=proxy-auth deploy verify undeploy
+    - make EXAMPLE=proxy-auth deploy verify undeploy
 
 example:req-disposition:
   extends: .integration-tests
   script:
     - cd ../examples/req-disposition
-    - make DEPLOY=kubectl EXAMPLE=builtin deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=alt-builtin deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=cacheability deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=cookie-pass deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=url-whitelist deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=purge deploy verify undeploy
+    - make EXAMPLE=builtin deploy verify undeploy
+    - make EXAMPLE=alt-builtin deploy verify undeploy
+    - make EXAMPLE=cacheability deploy verify undeploy
+    - make EXAMPLE=cookie-pass deploy verify undeploy
+    - make EXAMPLE=url-whitelist deploy verify undeploy
+    - make EXAMPLE=purge deploy verify undeploy
 
 example:varnish-pod-template:
   extends: .integration-tests
   script:
     - cd ../examples/varnish_pod_template
-    - make DEPLOY=kubectl EXAMPLE=cli-args deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=proxy deploy verify undeploy
-    - make DEPLOY=kubectl EXAMPLE=env deploy verify undeploy
+    - make EXAMPLE=cli-args deploy verify undeploy
+    - make EXAMPLE=proxy deploy verify undeploy
+    - make EXAMPLE=env deploy verify undeploy
 
 example:tls:hello:
   extends: .integration-tests
   script:
     - cd ../examples/tls/hello
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:tls:sni:
   extends: .integration-tests
   script:
     - cd ../examples/tls/sni
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 example:externalname:
   extends: .integration-tests
   script:
     - cd ../examples/externalname
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 regression:tls:delete-secret:
   extends: .integration-tests
   script:
     - cd ../test/e2e/deleteTLSsecret
-    - make DEPLOY=kubectl deploy verify undeploy
+    - make deploy verify undeploy
 
 .integration-tests:
   needs: ["build:controller"]
@@ -245,6 +245,7 @@ regression:tls:delete-secret:
   variables:
     KUBECTL: v1.17.0
     KIND: v0.7.0
+    HELM: v3.1.0
   before_script:
     - apk add -U wget
     - apk add -U curl
@@ -256,6 +257,11 @@ regression:tls:delete-secret:
     - chmod +x /usr/local/bin/kind
     - wget -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl
     - chmod +x /usr/local/bin/kubectl
+    - wget -O helm.tar.gz https://get.helm.sh/helm-$(HELM)-linux-amd64.tar.gz
+    - tar --strip-components=1 -xzvvf helm.tar.gz linux-amd64/helm
+    - rm -f helm.tar.gz
+    - mv helm /usr/local/bin
+    - chmod +x /usr/local/bin/helm
     - kind create cluster --config=.kind-gitlab.yaml
     - sed -i -E -e 's/localhost|0\.0\.0\.0/docker/g' "$HOME/.kube/config"
     - kubectl get nodes -o wide
@@ -273,7 +279,7 @@ regression:tls:delete-secret:
     - kind load docker-image varnish-ingress/haproxy
     - kind load docker-image varnish-ingress/controller
     - cd deploy
-    - make TEST=local DEPLOY=kubectl deploy verify
+    - make TEST=local deploy verify
 
 # basic step for a pipeline to build the varnish image
 .build-varnish: