diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-25 12:06:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-25 12:06:13 +0000 |
commit | 8f1f6b374b69fd6356bdc5561d56f5ca9db9fadd (patch) | |
tree | 9b81a74772b269cf3d851ed2d29f97c31985b98a /scripts | |
parent | dbd50b6e203994cdb393494faa8fc1b2fb406487 (diff) | |
download | gitlab-ce-8f1f6b374b69fd6356bdc5561d56f5ca9db9fadd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index be8d5296104..79f44e1c5d0 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -141,6 +141,7 @@ function install_tiller() { --tiller-namespace "${namespace}" \ --wait \ --upgrade \ + --force-upgrade \ --node-selectors "app=helm" \ --replicas 3 \ --override "spec.template.spec.tolerations[0].key"="dedicated" \ @@ -214,6 +215,21 @@ function create_application_secret() { --dry-run -o json | kubectl apply -f - } +function label_application_secret() { + local namespace="${KUBE_NAMESPACE}" + local release="${CI_ENVIRONMENT_SLUG}" + + echoinfo "Labeling the ${release}-gitlab-initial-root-password and ${release}-gitlab-license secrets in the ${namespace} namespace..." true + + kubectl label secret --namespace "${namespace}" \ + "${release}-gitlab-initial-root-password" \ + release="${release}" + + kubectl label secret --namespace "${namespace}" \ + "${release}-gitlab-license" \ + release="${release}" +} + function download_chart() { echoinfo "Downloading the GitLab chart..." true @@ -254,6 +270,7 @@ function deploy() { gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-${edition}" create_application_secret + label_application_secret HELM_CMD=$(cat << EOF helm upgrade \ |