diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-29 20:04:32 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-29 20:04:32 +0000 |
| commit | 5652533a9cd1f64a932c565e3a0f9707ceec766b (patch) | |
| tree | 25664e948a0f83bc2d23656f54e806404affec34 | |
| parent | 96516f7ef32c16d8b85d4be3d8d0252f81341c99 (diff) | |
| parent | f13f308c564a073759340566a398c3e83608fb5f (diff) | |
| download | gitlab-ce-5652533a9cd1f64a932c565e3a0f9707ceec766b.tar.gz | |
Merge branch '55820-adds-common-name-chart-value' into 'master'
Overrides commonName Helm chart value
Closes #55820
See merge request gitlab-org/gitlab-ce!24683
| -rw-r--r-- | changelogs/unreleased/55820-adds-common-name-chart-value.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changelogs/unreleased/55820-adds-common-name-chart-value.yml b/changelogs/unreleased/55820-adds-common-name-chart-value.yml new file mode 100644 index 00000000000..1871abbfc6b --- /dev/null +++ b/changelogs/unreleased/55820-adds-common-name-chart-value.yml @@ -0,0 +1,5 @@ +--- +title: Ensure Cert Manager works with Auto DevOps URLs greater than 64 bytes +merge_request: 24683 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 47e3e8cd271..75a5bf142d2 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -116,7 +116,7 @@ code_quality: license_management: stage: test - image: + image: name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable" entrypoint: [""] allow_failure: true @@ -612,7 +612,7 @@ rollout 100%: export APPLICATION_SECRET_NAME=$(application_secret_name "$track") env | sed -n "s/^K8S_SECRET_\(.*\)$/\1/p" > k8s_prefixed_variables - + kubectl create secret \ -n "$KUBE_NAMESPACE" generic "$APPLICATION_SECRET_NAME" \ --from-env-file k8s_prefixed_variables -o yaml --dry-run | @@ -689,6 +689,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.$AUTO_DEVOPS_DOMAIN" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \ @@ -724,6 +725,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.$AUTO_DEVOPS_DOMAIN" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \ |