diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-21 01:21:42 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-21 01:21:42 +0300 |
| commit | 2d8ba2db6712e365fbb7a6292a31d6606f2fe5e2 (patch) | |
| tree | 0b8d6ebc6d3db0043768ba3d9963155e20497709 /lib | |
| parent | 7a9a65e5b4b105c54bc86d3686026ad6fc69175d (diff) | |
| parent | 81ab70131420e9b21d8f4589a3756b288827fa15 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 5f7af2ffc20..779f4b5f006 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" \ |