Commit eb58e227 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents e1d3768c 5652533a
---
title: Ensure Cert Manager works with Auto DevOps URLs greater than 64 bytes
merge_request: 24683
author:
type: fixed
...@@ -116,7 +116,7 @@ code_quality: ...@@ -116,7 +116,7 @@ code_quality:
license_management: license_management:
stage: test stage: test
image: image:
name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable" name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
entrypoint: [""] entrypoint: [""]
allow_failure: true allow_failure: true
...@@ -612,7 +612,7 @@ rollout 100%: ...@@ -612,7 +612,7 @@ rollout 100%:
export APPLICATION_SECRET_NAME=$(application_secret_name "$track") export APPLICATION_SECRET_NAME=$(application_secret_name "$track")
env | sed -n "s/^K8S_SECRET_\(.*\)$/\1/p" > k8s_prefixed_variables env | sed -n "s/^K8S_SECRET_\(.*\)$/\1/p" > k8s_prefixed_variables
kubectl create secret \ kubectl create secret \
-n "$KUBE_NAMESPACE" generic "$APPLICATION_SECRET_NAME" \ -n "$KUBE_NAMESPACE" generic "$APPLICATION_SECRET_NAME" \
--from-env-file k8s_prefixed_variables -o yaml --dry-run | --from-env-file k8s_prefixed_variables -o yaml --dry-run |
...@@ -689,6 +689,7 @@ rollout 100%: ...@@ -689,6 +689,7 @@ rollout 100%:
--set application.database_url="$DATABASE_URL" \ --set application.database_url="$DATABASE_URL" \
--set application.secretName="$APPLICATION_SECRET_NAME" \ --set application.secretName="$APPLICATION_SECRET_NAME" \
--set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \ --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \
--set service.commonName="le.$AUTO_DEVOPS_DOMAIN" \
--set service.url="$CI_ENVIRONMENT_URL" \ --set service.url="$CI_ENVIRONMENT_URL" \
--set service.additionalHosts="$additional_hosts" \ --set service.additionalHosts="$additional_hosts" \
--set replicaCount="$replicas" \ --set replicaCount="$replicas" \
...@@ -724,6 +725,7 @@ rollout 100%: ...@@ -724,6 +725,7 @@ rollout 100%:
--set application.database_url="$DATABASE_URL" \ --set application.database_url="$DATABASE_URL" \
--set application.secretName="$APPLICATION_SECRET_NAME" \ --set application.secretName="$APPLICATION_SECRET_NAME" \
--set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \ --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \
--set service.commonName="le.$AUTO_DEVOPS_DOMAIN" \
--set service.url="$CI_ENVIRONMENT_URL" \ --set service.url="$CI_ENVIRONMENT_URL" \
--set service.additionalHosts="$additional_hosts" \ --set service.additionalHosts="$additional_hosts" \
--set replicaCount="$replicas" \ --set replicaCount="$replicas" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment