diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 670175a6f113f3c48e7d2f8210684b08992bfda0..d4c847cf1c02e905ad640a892adf98e986e4060c 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -39,7 +39,7 @@ review-build-cng: variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" - GITLAB_HELM_CHART_REF: "v5.4.1" + GITLAB_HELM_CHART_REF: "v5.5.0" environment: name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index 7bb9c0100166b1f34f3b3eaf75e33fb50e3f0169..2cdac51c6f6dee1abd9af613b3035733d93be371 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -64,7 +64,7 @@ gitlab: memory: 2890M hpa: targetAverageValue: 650m - task-runner: + toolbox: resources: requests: cpu: 300m diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index edb55a8355539e3adc90b59c4150b081d002b2aa..0d76c0d33aa68153d38d9b173f0c5d361d421bde 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -120,9 +120,9 @@ function get_pod() { function run_task() { local namespace="${CI_ENVIRONMENT_SLUG}" local ruby_cmd="${1}" - local task_runner_pod=$(get_pod "task-runner") + local toolbox_pod=$(get_pod "toolbox") - kubectl exec --namespace "${namespace}" "${task_runner_pod}" -- gitlab-rails runner "${ruby_cmd}" + kubectl exec --namespace "${namespace}" "${toolbox_pod}" -- gitlab-rails runner "${ruby_cmd}" } function disable_sign_ups() { @@ -290,8 +290,8 @@ HELM_CMD=$(cat << EOF --set gitlab.webservice.image.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.webservice.workhorse.image="${gitlab_workhorse_image_repository}" \ --set gitlab.webservice.workhorse.tag="${CI_COMMIT_REF_SLUG}" \ - --set gitlab.task-runner.image.repository="${gitlab_toolbox_image_repository}" \ - --set gitlab.task-runner.image.tag="${CI_COMMIT_REF_SLUG}" + --set gitlab.toolbox.image.repository="${gitlab_toolbox_image_repository}" \ + --set gitlab.toolbox.image.tag="${CI_COMMIT_REF_SLUG}" EOF )