From 699b5869a24bbe3da2b865992ca432ed84f60bf4 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Fri, 4 Oct 2024 09:41:21 -0400 Subject: [PATCH] Pull gitlab-runner-helper image from GitLab instead of Docker Hub This should help alleviate some of the rate limiting problems we've recently experienced in our CI pipelines. Note that this commit also bumps the helper_image version for the windows protected runner from v16.11.1 to v16.11.3. This patch version bump was inadvertently skipped in PR #946 --- k8s/production/runners/protected/graviton/2/release.yaml | 2 +- k8s/production/runners/protected/graviton/3/release.yaml | 2 +- k8s/production/runners/protected/x86_64/v2-win/release.yaml | 2 +- k8s/production/runners/public/graviton/2/release.yaml | 2 +- k8s/production/runners/public/graviton/3/release.yaml | 2 +- k8s/production/runners/public/x86_64/v2-win/release.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/k8s/production/runners/protected/graviton/2/release.yaml b/k8s/production/runners/protected/graviton/2/release.yaml index 4fca35167..4f189b006 100644 --- a/k8s/production/runners/protected/graviton/2/release.yaml +++ b/k8s/production/runners/protected/graviton/2/release.yaml @@ -75,7 +75,7 @@ spec: output_limit = 20480 environment = ["FF_GITLAB_REGISTRY_HELPER_IMAGE=1"] [runners.kubernetes] - helper_image = "gitlab/gitlab-runner-helper:arm-latest" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:arm-latest" privileged = false helper_memory_request = "512M" diff --git a/k8s/production/runners/protected/graviton/3/release.yaml b/k8s/production/runners/protected/graviton/3/release.yaml index 5183f8a42..1a995144f 100644 --- a/k8s/production/runners/protected/graviton/3/release.yaml +++ b/k8s/production/runners/protected/graviton/3/release.yaml @@ -75,7 +75,7 @@ spec: output_limit = 20480 environment = ["FF_GITLAB_REGISTRY_HELPER_IMAGE=1"] [runners.kubernetes] - helper_image = "gitlab/gitlab-runner-helper:arm-latest" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:arm-latest" privileged = false helper_memory_request = "512M" diff --git a/k8s/production/runners/protected/x86_64/v2-win/release.yaml b/k8s/production/runners/protected/x86_64/v2-win/release.yaml index 8cb13fc67..f127806c3 100644 --- a/k8s/production/runners/protected/x86_64/v2-win/release.yaml +++ b/k8s/production/runners/protected/x86_64/v2-win/release.yaml @@ -106,7 +106,7 @@ spec: # Image for windows 2022, runner helper image = "mcr.microsoft.com/windows/servercore:ltsc2022" - helper_image = "gitlab/gitlab-runner-helper:x86_64-v16.11.1-servercore21H2" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:x86_64-v16.11.3-servercore21H2" ephemeral_storage_request = "500M" helper_ephemeral_storage_request = "500M" diff --git a/k8s/production/runners/public/graviton/2/release.yaml b/k8s/production/runners/public/graviton/2/release.yaml index 94f723c01..9d74ae322 100644 --- a/k8s/production/runners/public/graviton/2/release.yaml +++ b/k8s/production/runners/public/graviton/2/release.yaml @@ -75,7 +75,7 @@ spec: output_limit = 20480 environment = ["FF_GITLAB_REGISTRY_HELPER_IMAGE=1"] [runners.kubernetes] - helper_image = "gitlab/gitlab-runner-helper:arm-latest" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:arm-latest" privileged = false helper_memory_request = "512M" diff --git a/k8s/production/runners/public/graviton/3/release.yaml b/k8s/production/runners/public/graviton/3/release.yaml index 30c21ce4b..b44437f55 100644 --- a/k8s/production/runners/public/graviton/3/release.yaml +++ b/k8s/production/runners/public/graviton/3/release.yaml @@ -75,7 +75,7 @@ spec: output_limit = 20480 environment = ["FF_GITLAB_REGISTRY_HELPER_IMAGE=1"] [runners.kubernetes] - helper_image = "gitlab/gitlab-runner-helper:arm-latest" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:arm-latest" privileged = false helper_memory_request = "512M" diff --git a/k8s/production/runners/public/x86_64/v2-win/release.yaml b/k8s/production/runners/public/x86_64/v2-win/release.yaml index 0bcbf7edc..5804c19b0 100644 --- a/k8s/production/runners/public/x86_64/v2-win/release.yaml +++ b/k8s/production/runners/public/x86_64/v2-win/release.yaml @@ -106,7 +106,7 @@ spec: # Image for windows 2022, runner helper image = "mcr.microsoft.com/windows/servercore:ltsc2022" - helper_image = "gitlab/gitlab-runner-helper:x86_64-v16.11.3-servercore21H2" + helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:x86_64-v16.11.3-servercore21H2" ephemeral_storage_request = "500M" helper_ephemeral_storage_request = "500M"