diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
| commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
| tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /scripts | |
| parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) | |
| download | gitlab-ce-6f2065c468b05658125b746169c56764a8ccddb1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/review_apps/base-config.yaml | 3 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index a54dadb8d85..83dc4de879a 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -111,7 +111,6 @@ nginx-ingress: controller: config: ssl-ciphers: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4 - replicaCount: 2 resources: requests: cpu: 100m @@ -119,7 +118,6 @@ nginx-ingress: limits: cpu: 200m memory: 675M - minAvailable: 1 service: enableHttp: false livenessProbe: @@ -134,7 +132,6 @@ nginx-ingress: limits: cpu: 10m memory: 24M - replicaCount: 1 postgresql: metrics: enabled: false diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 62360dfe298..ca69fa6c02b 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -279,7 +279,7 @@ function deploy() { IMAGE_REPOSITORY="registry.gitlab.com/gitlab-org/build/cng-mirror" gitlab_migrations_image_repository="${IMAGE_REPOSITORY}/gitlab-rails-${edition}" gitlab_sidekiq_image_repository="${IMAGE_REPOSITORY}/gitlab-sidekiq-${edition}" - gitlab_unicorn_image_repository="${IMAGE_REPOSITORY}/gitlab-unicorn-${edition}" + gitlab_unicorn_image_repository="${IMAGE_REPOSITORY}/gitlab-webservice-${edition}" gitlab_task_runner_image_repository="${IMAGE_REPOSITORY}/gitlab-task-runner-${edition}" gitlab_gitaly_image_repository="${IMAGE_REPOSITORY}/gitaly" gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell" |