From 3d5ed5c5160a8e992a537d2cdb5ab491ec3dfd3f Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Sun, 24 Jun 2018 14:30:13 +1000
Subject: [PATCH] Turn review jobs back on

Use a new "rego-review" namespace to not interfere with the dev instance.
---
 .gitlab-ci.yml                  | 64 ++++++++++++++++-----------------
 k8s/deployment_template.jsonnet |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbaf6d00..e8b10705 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,39 +84,39 @@ k8s-2019_dev-deploy:
     name: 2019/dev
     url: https://dev.lca2019.org
 
-# k8s-2019_dev_review-deploy:
-#   image: google/cloud-sdk
-#   stage: deploy
-#   script:
-#   - echo "${CA_CERT}" > cert.crt
-#   - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
-#   - kubectl config set-context cluster --cluster=cluster --namespace=rego-dev --user=gitlab-sa
-#   - kubectl config use-context cluster
-#   - kubectl --token "${GL_KUBE_TOKEN}" apply -f k8s/deployment.json
-#   - kubectl --token "${GL_KUBE_TOKEN}" describe ingress | grep "${CI_COMMIT_REF_SLUG}" || kubectl --token "${GL_KUBE_TOKEN}" patch ingress symposion-app-ingress -p "$(cat k8s/ingress-patch.json)" --type json
-#   only:
-#   - /^dev\/.*$/
-#   environment:
-#     name: 2019/dev/${CI_COMMIT_REF_SLUG}
-#     url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
-#     on_stop: k8s-2019_dev_review-stop-deploy
+k8s-2019_dev_review-deploy:
+  image: google/cloud-sdk
+  stage: deploy
+  script:
+  - echo "${CA_CERT}" > cert.crt
+  - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
+  - kubectl config set-context cluster --cluster=cluster --namespace=rego-review --user=rego-dev/gitlab-sa
+  - kubectl config use-context cluster
+  - kubectl --token "${GL_KUBE_TOKEN}" apply -f k8s/deployment.json
+  - kubectl --token "${GL_KUBE_TOKEN}" describe ingress | grep "${CI_COMMIT_REF_SLUG}" || kubectl --token "${GL_KUBE_TOKEN}" patch ingress symposion-app-ingress -p "$(cat k8s/ingress-patch.json)" --type json
+  only:
+  - /^dev\/.*$/
+  environment:
+    name: 2019/dev/${CI_COMMIT_REF_SLUG}
+    url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
+    on_stop: k8s-2019_dev_review-stop-deploy
 
-# k8s-2019_dev_review-stop-deploy:
-#   image: google/cloud-sdk
-#   stage: deploy
-#   script:
-#   - echo "${CA_CERT}" > cert.crt
-#   - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
-#   - kubectl config set-context cluster --cluster=cluster --namespace=rego-dev --user=gitlab-sa
-#   - kubectl config use-context cluster
-#   - kubectl --token "${GL_KUBE_TOKEN}" delete -f k8s/deployment.json
-#   only:
-#   - /^dev\/.*$/
-#   when: manual
-#   environment:
-#     name: 2019/dev/${CI_COMMIT_REF_SLUG}
-#     url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
-#     action: stop
+k8s-2019_dev_review-stop-deploy:
+  image: google/cloud-sdk
+  stage: deploy
+  script:
+  - echo "${CA_CERT}" > cert.crt
+  - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
+  - kubectl config set-context cluster --cluster=cluster --namespace=rego-review --user=rego-dev/gitlab-sa
+  - kubectl config use-context cluster
+  - kubectl --token "${GL_KUBE_TOKEN}" delete -f k8s/deployment.json
+  only:
+  - /^dev\/.*$/
+  when: manual
+  environment:
+    name: 2019/dev/${CI_COMMIT_REF_SLUG}
+    url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
+    action: stop
 
 k8s-2019_staging-deploy:
   image: google/cloud-sdk
diff --git a/k8s/deployment_template.jsonnet b/k8s/deployment_template.jsonnet
index b6d9047e..dd5b55f8 100644
--- a/k8s/deployment_template.jsonnet
+++ b/k8s/deployment_template.jsonnet
@@ -1,7 +1,7 @@
 function (slug) {
   
   local app = "symposion-app-" + slug,
-  local namespace = "rego-dev",
+  local namespace = "rego-review",
   local domain = slug + ".dev.lca2019.org",
   
   "deployment.json":