NAMESPACE_DEV_TO_STAGING

capif/templates/cd-deploy-ocf.gitlab-ci.yml

@@ -109,11 +109,12 @@ deploy_ocf_staging:
       done
       
       export CI_ENV_ENDPOINT=$(cat cd_env_endpoint.txt)
+      export NAMESPACE_DEV_TO_STAGING=$(echo $CI_ENV_ENDPOINT)
 
       echo "### download dependencies###"
       helm dependency build helm/capif
       echo "### updating capif###"
-      helm upgrade --install -n $NAMESPACE_DEV ocf-pre-staging helm/capif/ \
+      helm upgrade --install -n $NAMESPACE_DEV_TO_STAGING ocf-pre-staging helm/capif/ \
       --set grafana.enabled=true \
       --set grafana.ingress.enabled=true \
       --set grafana.ingress.hosts[0].host=ocf-mon-$CI_ENV_ENDPOINT.$DOMAIN_DEV \
@@ -237,8 +238,8 @@ delete_ocf_staging:
   <<: *staging_common
   script:
     - echo "### deleting environment $NAMESPACE_STAGING###"
-    - helm uninstall -n $NAMESPACE_DEV ocf-pre-staging
-    - kubectl delete ns $NAMESPACE_DEV --force
+    - helm uninstall -n $NAMESPACE_DEV_TO_STAGING ocf-pre-staging
+    - kubectl delete ns $NAMESPACE_DEV_TO_STAGING --force
   when: manual
   environment:
     name: review/dev_to_staging