diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 9fa678c13f936252fe541dc26915b67d0875d402..397070657b5d272dc9e70d2ea1819b7b1c406b9c 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -1,6 +1,8 @@ .deploy: stage: deploy image: $DEPLOY_KUBERNETES_IMAGE + variables: + DEPLOYMENT_CHART_NAME: ${CI_COMMIT_REF_SLUG} script: - .gitlab/deployment_scripts/update_secret.sh - .gitlab/deployment_scripts/update_deployment.sh @@ -17,6 +19,7 @@ deploy_review: variables: DEPLOYMENT_URL: "${CI_COMMIT_REF_SLUG}.review.metager.de" DEPLOYMENT_HELM_VALUES: .gitlab/review.yaml + DEPLOYMENT_CHART_NAME: review-${CI_COMMIT_REF_SLUG} rules: - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "development"' when: never diff --git a/.gitlab/review.yaml b/.gitlab/review.yaml index 5027301c1f631c6b36105a53606c8ad3610fbe82..870ff001581d3c79d57e18274cb463f8362b1fb2 100644 --- a/.gitlab/review.yaml +++ b/.gitlab/review.yaml @@ -3,8 +3,7 @@ ingress: kubernetes.io/tls-acme: "true" cert-manager.io/cluster-issuer: letsencrypt-prod hosts: - - host: replaced_by_deployment_script - paths: + - paths: - path: / pathType: ImplementationSpecific tls: