diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 862c89dafbeb938fa1e72eba424cbe8de0346f0f..33ccf6013034cc5eebb887618c5819aa385d7192 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,10 +44,11 @@ build_review_deployment: - 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 @@ -91,7 +92,8 @@ k8s-2019_dev_review-deploy: - 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: @@ -107,7 +109,7 @@ k8s-2019_dev_review-stop-deploy: - 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