From c943de1c886cf2f6aa72f0ed0a3b905cd8886ce5 Mon Sep 17 00:00:00 2001
From: Gary van Woerkens <gary.van-woerkens@sg.social.gouv.fr>
Date: Fri, 25 Sep 2020 13:02:07 +0200
Subject: [PATCH] fix: Make dev2 and prod2 compliant pipes.

---
 .gitlab-ci.yml                       | 11 +++++++++++
 targets/alert-cli/.gitlab-ci.yml     |  8 ++++++++
 targets/frontend/.gitlab-ci.yml      |  4 ++++
 targets/frontend/.k8s/www.values.yml |  2 ++
 targets/hasura/.gitlab-ci.yml        |  4 ++++
 5 files changed, 29 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b3b8f439..e1a944ba2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,8 @@ variables:
 Create namespace:
   extends:
     - .autodevops_create_namespace
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
   after_script:
     # Copy namespace default creds
     - kubectl get secret cdtn-admin-secrets --namespace=cdtn-admin-secret --export -o yaml |
@@ -33,6 +35,13 @@ Create Azure DB (dev):
 
 #
 
+Stop review:
+  extends: .autodevops_stop_review
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
+
+#
+
 Install:
   only:
     - never
@@ -57,6 +66,8 @@ Register image:
 Deploy app (dev):
   only:
     - never
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
 
 Deploy app (prod):
   only:
diff --git a/targets/alert-cli/.gitlab-ci.yml b/targets/alert-cli/.gitlab-ci.yml
index c2fcd0c7a..af36d8b42 100644
--- a/targets/alert-cli/.gitlab-ci.yml
+++ b/targets/alert-cli/.gitlab-ci.yml
@@ -67,11 +67,15 @@ Deploy alert (dev):
   extends:
     - .autodevops_deploy_app_dev
     - .deploy_alert_stage
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
 
 Deploy alert (prod):
   extends:
     - .autodevops_deploy_app_prod
     - .deploy_alert_stage
+  environment:
+    name: prod2
   variables:
     PRODUCTION: "true"
 
@@ -104,8 +108,12 @@ Trigger alert (dev):
   extends:
     - .autodevops_deploy_app_dev
     - .trigger_alert_cron
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
 
 Trigger alert (prod):
   extends:
     - .autodevops_deploy_app_prod
     - .trigger_alert_cron
+  environment:
+    name: prod2
diff --git a/targets/frontend/.gitlab-ci.yml b/targets/frontend/.gitlab-ci.yml
index c0e766ec0..09d9404f9 100644
--- a/targets/frontend/.gitlab-ci.yml
+++ b/targets/frontend/.gitlab-ci.yml
@@ -104,6 +104,8 @@ Deploy www (dev):
   extends:
     - .autodevops_deploy_app_dev
     - .deploy_www_stage
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
   variables:
     MANIFEST_FOLDER: targets/frontend/.k8s/environments/dev
 
@@ -111,5 +113,7 @@ Deploy www (prod):
   extends:
     - .autodevops_deploy_app_prod
     - .deploy_www_stage
+  environment:
+    name: prod2
   variables:
     MANIFEST_FOLDER: targets/frontend/.k8s/environments/prod
diff --git a/targets/frontend/.k8s/www.values.yml b/targets/frontend/.k8s/www.values.yml
index f7f65d932..2f51987d9 100644
--- a/targets/frontend/.k8s/www.values.yml
+++ b/targets/frontend/.k8s/www.values.yml
@@ -35,3 +35,5 @@ deployment:
         name: cdtn-admin-secrets
 ingress:
   enabled: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
diff --git a/targets/hasura/.gitlab-ci.yml b/targets/hasura/.gitlab-ci.yml
index 5c06221d7..3e2311a6a 100644
--- a/targets/hasura/.gitlab-ci.yml
+++ b/targets/hasura/.gitlab-ci.yml
@@ -20,6 +20,8 @@ Deploy Hasura (dev):
   extends:
     - .autodevops_deploy_app_dev
     - .deploy_hasura
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}-dev2
   variables:
     PG_HOST: cdtnadmindevserver.postgres.database.azure.com
     HELM_RENDER_ARGS: >-
@@ -30,5 +32,7 @@ Deploy Hasura (prod):
   extends:
     - .autodevops_deploy_app_prod
     - .deploy_hasura
+  environment:
+    name: prod2
   variables:
     PRODUCTION: "true"