diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-21 15:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-21 15:09:12 +0000 |
| commit | a09c6d7e91de9abab7e2ea8dffce1cbb89bf95d8 (patch) | |
| tree | bab46ee809784804b92228a0b860f3837b050755 /scripts | |
| parent | 32ac796097b0b8fbdbc22157307d1849a3e7b35c (diff) | |
| download | gitlab-ce-a09c6d7e91de9abab7e2ea8dffce1cbb89bf95d8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 4 | ||||
| -rw-r--r-- | scripts/utils.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index b6ac7b4281b..e979d0f75cf 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -219,7 +219,7 @@ function create_application_secret() { kubectl create secret generic --namespace "${namespace}" \ "shared-gitlab-initial-root-password" \ --from-literal="password=${REVIEW_APPS_ROOT_PASSWORD}" \ - --dry-run -o json | kubectl apply -f - + --dry-run=client -o json | kubectl apply -f - else echoinfo "The 'shared-gitlab-initial-root-password' secret already exists in the ${namespace} namespace." fi @@ -232,7 +232,7 @@ function create_application_secret() { kubectl create secret generic --namespace "${namespace}" \ "shared-gitlab-license" \ --from-file=license="${REVIEW_APPS_EE_LICENSE_FILE}" \ - --dry-run -o json | kubectl apply -f - + --dry-run=client -o json | kubectl apply -f - else echoinfo "The 'shared-gitlab-license' secret already exists in the ${namespace} namespace." fi diff --git a/scripts/utils.sh b/scripts/utils.sh index d9205921963..335b2eb41e7 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -72,10 +72,6 @@ function setup_db() { run_timed_command "setup_db_praefect" } -function install_api_client_dependencies_with_apk() { - run_timed_command "apk add --update openssl curl jq" -} - function install_gitlab_gem() { run_timed_command "gem install httparty --no-document --version 0.18.1" run_timed_command "gem install gitlab --no-document --version 4.17.0" |