From 81ab70131420e9b21d8f4589a3756b288827fa15 Mon Sep 17 00:00:00 2001 From: Tiger Date: Thu, 16 May 2019 12:37:55 -0500 Subject: [PATCH] Add project ID to Let's Encrypt common name --- .../unreleased/61697-add-project-id-to-le-common-name.yml | 5 +++++ lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/61697-add-project-id-to-le-common-name.yml diff --git a/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml b/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml new file mode 100644 index 00000000000..8ffa8d0a51a --- /dev/null +++ b/changelogs/unreleased/61697-add-project-id-to-le-common-name.yml @@ -0,0 +1,5 @@ +--- +title: Prevent common name collisions when requesting multiple Let's Encrypt certificates concurrently +merge_request: 28373 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 876f53c66ba..98992be23a7 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -382,7 +382,7 @@ rollout 100%: --set application.database_url="$DATABASE_URL" \ --set application.secretName="$APPLICATION_SECRET_NAME" \ --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \ - --set service.commonName="le.$KUBE_INGRESS_BASE_DOMAIN" \ + --set service.commonName="le-$CI_PROJECT_ID.$KUBE_INGRESS_BASE_DOMAIN" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \ @@ -423,7 +423,7 @@ rollout 100%: --set application.database_url="$DATABASE_URL" \ --set application.secretName="$APPLICATION_SECRET_NAME" \ --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \ - --set service.commonName="le.$KUBE_INGRESS_BASE_DOMAIN" \ + --set service.commonName="le-$CI_PROJECT_ID.$KUBE_INGRESS_BASE_DOMAIN" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \