VHOST

.gitlab-ci.yml

@@ -12,9 +12,6 @@ yelb:
   image: $KUBECTL
   script:
     - NS=$(kubectl config view --minify --output 'jsonpath={..namespace}')
-    - VHOST=yelb.$NS.$CLUSTER
-    - echo $VHOST
-    - mo deploy/yelb.yaml
     - VHOST=yelb.$NS.$CLUSTER mo deploy/yelb.yaml | kubectl apply -f -
 
 istio:
@@ -23,11 +20,10 @@ istio:
   when: manual
   script:
     - NS=$(kubectl config view --minify --output 'jsonpath={..namespace}')
-    - VHOST=yelb.$NS.$CLUSTER
     - kubectl label ns $NS istio-inject=enabled --overwrite
-    - mo deploy/yelb.yaml | kubectl delete -f -
+    - VHOST=yelb.$NS.$CLUSTER mo deploy/yelb.yaml | kubectl delete -f -
     - sleep 5
-    - mo deploy/yelb.yaml | kubectl apply -f -
+    - VHOST=yelb.$NS.$CLUSTER mo deploy/yelb.yaml | kubectl apply -f -
 
 shutdown:
   stage: teardown
@@ -35,6 +31,5 @@ shutdown:
   when: manual
   script:
     - NS=$(kubectl config view --minify --output 'jsonpath={..namespace}')
-    - VHOST=yelb.$NS.$CLUSTER
     - kubectl label ns $NS istio-inject=disabled --overwrite
-    - mo deploy/yelb.yaml | kubectl delete -f -
+    - VHOST=yelb.$NS.$CLUSTER mo deploy/yelb.yaml | kubectl delete -f -