Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turn review jobs back on

Browse source 
Use a new "rego-review" namespace to not interfere with the dev instance.
This commit is contained in:
James Polley 2018-06-24 14:30:13 +10:00
parent 2d5443be89
commit 3d5ed5c516
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
.gitlab-ci.yml
View file

@ -84,39 +84,39 @@ k8s-2019_dev-deploy:
name: 2019/dev name: 2019/dev
url: https://dev.lca2019.org url: https://dev.lca2019.org
# k8s-2019_dev_review-deploy: k8s-2019_dev_review-deploy:
# image: google/cloud-sdk image: google/cloud-sdk
# stage: deploy stage: deploy
# script: script:
# - echo "${CA_CERT}" > cert.crt - echo "${CA_CERT}" > cert.crt
# - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=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 set-context cluster --cluster=cluster --namespace=rego-review --user=rego-dev/gitlab-sa
# - kubectl config use-context cluster - kubectl config use-context cluster
# - kubectl --token "${GL_KUBE_TOKEN}" apply -f k8s/deployment.json - 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 - 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: only:
# - /^dev\/.*$/ - /^dev\/.*$/
# environment: environment:
# name: 2019/dev/${CI_COMMIT_REF_SLUG} name: 2019/dev/${CI_COMMIT_REF_SLUG}
# url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
# on_stop: k8s-2019_dev_review-stop-deploy on_stop: k8s-2019_dev_review-stop-deploy
# k8s-2019_dev_review-stop-deploy: k8s-2019_dev_review-stop-deploy:
# image: google/cloud-sdk image: google/cloud-sdk
# stage: deploy stage: deploy
# script: script:
# - echo "${CA_CERT}" > cert.crt - echo "${CA_CERT}" > cert.crt
# - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=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 set-context cluster --cluster=cluster --namespace=rego-review --user=rego-dev/gitlab-sa
# - kubectl config use-context cluster - kubectl config use-context cluster
# - kubectl --token "${GL_KUBE_TOKEN}" delete -f k8s/deployment.json - kubectl --token "${GL_KUBE_TOKEN}" delete -f k8s/deployment.json
# only: only:
# - /^dev\/.*$/ - /^dev\/.*$/
# when: manual when: manual
# environment: environment:
# name: 2019/dev/${CI_COMMIT_REF_SLUG} name: 2019/dev/${CI_COMMIT_REF_SLUG}
# url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org url: https://${CI_COMMIT_REF_SLUG}.dev.lca2019.org
# action: stop action: stop
k8s-2019_staging-deploy: k8s-2019_staging-deploy:
image: google/cloud-sdk image: google/cloud-sdk

2
k8s/deployment_template.jsonnet
View file

@ -1,7 +1,7 @@
function (slug) { function (slug) {
local app = "symposion-app-" + slug, local app = "symposion-app-" + slug,
local namespace = "rego-dev", local namespace = "rego-review",
local domain = slug + ".dev.lca2019.org", local domain = slug + ".dev.lca2019.org",
"deployment.json": "deployment.json":