Merge branch 'vendor-10-4-auto-devops-template' into 'master'
Vendor 10.4 Auto DevOps template See merge request gitlab-org/gitlab-ce!16639
This commit is contained in:
commit
ea14c1e696
|
@ -345,12 +345,6 @@ production:
|
||||||
replicas="$new_replicas"
|
replicas="$new_replicas"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$CI_PROJECT_VISIBILITY" != "public" ]]; then
|
|
||||||
secret_name='gitlab-registry'
|
|
||||||
else
|
|
||||||
secret_name=''
|
|
||||||
fi
|
|
||||||
|
|
||||||
helm upgrade --install \
|
helm upgrade --install \
|
||||||
--wait \
|
--wait \
|
||||||
--set service.enabled="$service_enabled" \
|
--set service.enabled="$service_enabled" \
|
||||||
|
@ -358,7 +352,6 @@ production:
|
||||||
--set image.repository="$CI_APPLICATION_REPOSITORY" \
|
--set image.repository="$CI_APPLICATION_REPOSITORY" \
|
||||||
--set image.tag="$CI_APPLICATION_TAG" \
|
--set image.tag="$CI_APPLICATION_TAG" \
|
||||||
--set image.pullPolicy=IfNotPresent \
|
--set image.pullPolicy=IfNotPresent \
|
||||||
--set image.secrets[0].name="$secret_name" \
|
|
||||||
--set application.track="$track" \
|
--set application.track="$track" \
|
||||||
--set application.database_url="$DATABASE_URL" \
|
--set application.database_url="$DATABASE_URL" \
|
||||||
--set service.url="$CI_ENVIRONMENT_URL" \
|
--set service.url="$CI_ENVIRONMENT_URL" \
|
||||||
|
@ -488,9 +481,6 @@ production:
|
||||||
|
|
||||||
function create_secret() {
|
function create_secret() {
|
||||||
echo "Create secret..."
|
echo "Create secret..."
|
||||||
if [[ "$CI_PROJECT_VISIBILITY" == "public" ]]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
kubectl create secret -n "$KUBE_NAMESPACE" \
|
kubectl create secret -n "$KUBE_NAMESPACE" \
|
||||||
docker-registry gitlab-registry \
|
docker-registry gitlab-registry \
|
||||||
|
|
Loading…
Reference in New Issue