diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /scripts/review_apps | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'scripts/review_apps')
| -rw-r--r-- | scripts/review_apps/base-config.yaml | 13 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index 0f6603fea8c..91c645a0ed9 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -1,3 +1,6 @@ +safe-to-evict: &safe-to-evict + cluster-autoscaler.kubernetes.io/safe-to-evict: "true" + global: appConfig: enableUsagePing: false @@ -29,6 +32,8 @@ gitlab: storageClass: ssd nodeSelector: preemptible: "false" + podAnnotations: + <<: *safe-to-evict gitlab-exporter: enabled: false mailroom: @@ -107,6 +112,8 @@ gitlab-runner: memory: 150M nodeSelector: preemptible: "true" + podAnnotations: + <<: *safe-to-evict minio: resources: requests: @@ -117,6 +124,8 @@ minio: memory: 280M nodeSelector: preemptible: "true" + podAnnotations: + <<: *safe-to-evict nginx-ingress: controller: config: @@ -159,6 +168,8 @@ postgresql: master: nodeSelector: preemptible: "false" + podAnnotations: + <<: *safe-to-evict prometheus: install: false redis: @@ -174,6 +185,8 @@ redis: master: nodeSelector: preemptible: "true" + podAnnotations: + <<: *safe-to-evict registry: hpa: minReplicas: 1 diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 695de95b8fc..f529c8eaafe 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -213,7 +213,7 @@ function create_application_secret() { local initial_root_password_shared_secret local gitlab_license_shared_secret - initial_root_password_shared_secret=$(kubectl get secret --namespace ${namespace} --no-headers -o=custom-columns=NAME:.metadata.name shared-gitlab-initial-root-password | tail -n 1) + initial_root_password_shared_secret=$(kubectl get secret --namespace ${namespace} --no-headers -o=custom-columns=NAME:.metadata.name shared-gitlab-initial-root-password 2> /dev/null | tail -n 1) if [[ "${initial_root_password_shared_secret}" == "" ]]; then echoinfo "Creating the 'shared-gitlab-initial-root-password' secret in the ${namespace} namespace..." true kubectl create secret generic --namespace "${namespace}" \ @@ -226,7 +226,7 @@ function create_application_secret() { if [ -z "${REVIEW_APPS_EE_LICENSE_FILE}" ]; then echo "License not found" && return; fi - gitlab_license_shared_secret=$(kubectl get secret --namespace ${namespace} --no-headers -o=custom-columns=NAME:.metadata.name shared-gitlab-license | tail -n 1) + gitlab_license_shared_secret=$(kubectl get secret --namespace ${namespace} --no-headers -o=custom-columns=NAME:.metadata.name shared-gitlab-license 2> /dev/null | tail -n 1) if [[ "${gitlab_license_shared_secret}" == "" ]]; then echoinfo "Creating the 'shared-gitlab-license' secret in the ${namespace} namespace..." true kubectl create secret generic --namespace "${namespace}" \ |