symposion_app File Diff · Conservancy Kallithea

File diff 304436881bff → 65bed40fafa0

.gitlab-ci.yml

➞

Show inline comments

@@ ... / @@ -41,16 +41,17 @@ k8s-prod-deploy: @@
 build_review_deployment:
   image: docker:git
   services:
     - docker:dind
   stage: build
   script:
-    - docker run -v "${PWD}"/k8s:/src sparkprime/jsonnet /src/deployment_template.jsonnet --tla-str slug="${CI_COMMIT_REF_SLUG}" > "${CI_COMMIT_REF_SLUG}".json
+    - docker run -v "${PWD}"/k8s:/src sparkprime/jsonnet /src/deployment_template.jsonnet --tla-str slug="${CI_COMMIT_REF_SLUG}" -m /src
   artifacts:
     paths:
       - "${CI_COMMIT_REF_SLUG}.json"
     - k8s/deployment.json
     - k8s/ingress-patch.json
 build_2019_dev_image:
   image: docker:git
   stage: build
   services:
   - docker:dind
@@ ... / @@ -88,13 +89,14 @@ k8s-2019_dev_review-deploy: @@
   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 ${CI_COMMIT_REF_SLUG}.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
   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
@@ ... / @@ -104,13 +106,13 @@ k8s-2019_dev_review-stop-deploy: @@
   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 ${CI_COMMIT_REF_SLUG}.json
+  - 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