diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-01-25 11:27:24 +0100 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-01-25 14:33:24 +0100 |
| commit | a56ed989edda195f330d0bf982122548308d2a99 (patch) | |
| tree | 9e3e378e1d2bcc195e497c84ec014b665154edc6 | |
| parent | 15a7f3c6af5286dee5188af045d3e80f95323472 (diff) | |
| download | gitlab-ce-55820-create-ci_environment_url-variables-64-bytes.tar.gz | |
Overrides commonName Helm chart attr with default value55820-create-ci_environment_url-variables-64-bytes
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 47e3e8cd271..2d7be4bd055 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" \ |