kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '61697-add-project-id-to-le-common-name' into 'master' 

Resolve "Cert Manager problems with Group/Instance cluster"

Closes #61697

See merge request gitlab-org/gitlab-ce!28373
This commit is contained in:
Robert Speicher 2019-05-20 22:21:42 +00:00
parent 7a9a65e5b4 81ab701314
commit 2d8ba2db67
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/61697-add-project-id-to-le-common-name.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Prevent common name collisions when requesting multiple Let's Encrypt certificates concurrently
merge_request: 28373
author:
type: fixed

4
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
View File

@ -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" \