Commit 28383338 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'bump-charts-version' into 'master'

ci: Bump the charts version used for Review Apps to 5.5.0

See merge request gitlab-org/gitlab!75016
parents cf6c99bc af7a35a4
...@@ -39,7 +39,7 @@ review-build-cng: ...@@ -39,7 +39,7 @@ review-build-cng:
variables: variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "v5.4.1" GITLAB_HELM_CHART_REF: "v5.5.0"
environment: environment:
name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
......
...@@ -64,7 +64,7 @@ gitlab: ...@@ -64,7 +64,7 @@ gitlab:
memory: 2890M memory: 2890M
hpa: hpa:
targetAverageValue: 650m targetAverageValue: 650m
task-runner: toolbox:
resources: resources:
requests: requests:
cpu: 300m cpu: 300m
......
...@@ -120,9 +120,9 @@ function get_pod() { ...@@ -120,9 +120,9 @@ function get_pod() {
function run_task() { function run_task() {
local namespace="${CI_ENVIRONMENT_SLUG}" local namespace="${CI_ENVIRONMENT_SLUG}"
local ruby_cmd="${1}" 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() { function disable_sign_ups() {
...@@ -290,8 +290,8 @@ HELM_CMD=$(cat << EOF ...@@ -290,8 +290,8 @@ HELM_CMD=$(cat << EOF
--set gitlab.webservice.image.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.webservice.image.tag="${CI_COMMIT_REF_SLUG}" \
--set gitlab.webservice.workhorse.image="${gitlab_workhorse_image_repository}" \ --set gitlab.webservice.workhorse.image="${gitlab_workhorse_image_repository}" \
--set gitlab.webservice.workhorse.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.webservice.workhorse.tag="${CI_COMMIT_REF_SLUG}" \
--set gitlab.task-runner.image.repository="${gitlab_toolbox_image_repository}" \ --set gitlab.toolbox.image.repository="${gitlab_toolbox_image_repository}" \
--set gitlab.task-runner.image.tag="${CI_COMMIT_REF_SLUG}" --set gitlab.toolbox.image.tag="${CI_COMMIT_REF_SLUG}"
EOF EOF
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment