Fix NSing

.gitlab-ci.yml

@@ -64,8 +64,8 @@ space-svc:
   script:
     - NS=$(kubectl config view -o jsonpath="{..namespace}")
     - kubectl label ns $NS istio-injection=disabled --overwrite  
-    - ID=NS mo deploy/space-deploy+svc.yaml | kubectl delete -f - || true
-    - ID=NS mo deploy/space-deploy+svc.yaml | kubectl apply -f -
+    - ID=$NS mo deploy/space-deploy+svc.yaml | kubectl delete -f - || true
+    - ID=$NS mo deploy/space-deploy+svc.yaml | kubectl apply -f -
 
 hiphop-svc:
   stage: deploy
@@ -73,14 +73,14 @@ hiphop-svc:
   script:
     - NS=$(kubectl config view -o jsonpath="{..namespace}")
     - kubectl label ns $NS istio-injection=disabled --overwrite
-    - ID=NS TIER=1 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
-    - ID=NS TIER=2 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
-    - ID=NS TIER=3 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
-    - ID=NS TIER=4 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
-    - ID=NS TIER=1 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
-    - ID=NS TIER=2 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
-    - ID=NS TIER=3 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
-    - ID=NS TIER=4 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
+    - ID=$NS TIER=1 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
+    - ID=$NS TIER=2 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
+    - ID=$NS TIER=3 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
+    - ID=$NS TIER=4 mo deploy/hiphop-deploy+svc.yaml | kubectl delete -f - || true
+    - ID=$NS TIER=1 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
+    - ID=$NS TIER=2 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
+    - ID=$NS TIER=3 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
+    - ID=$NS TIER=4 mo deploy/hiphop-deploy+svc.yaml | kubectl apply -f -
 
 cleanup:
   stage: teardown