Add helm to distribution_ci_tools image

Why

Addressing gitlab-org/charts/gitlab#6419 (closed),

The release_package CI job in gitlab-org/charts/gitlab uses the distribution_ci_tools image and calls scripts/wait_for_charts_availability.sh, which requires helm. The image currently does not include helm, causing the job to fail.

Failed job: https://dev.gitlab.org/gitlab/charts/gitlab/-/jobs/35772796

What changed

  • Added HELM_VERSION=4.1.4 to docker/VERSIONS
  • Created docker/snippets/helm (for both amd64 and arm64) snippet following the same pattern as kubectl
  • Added helm to the snippet includes in both Dockerfile_distribution_ci_tools.erb and Dockerfile_distribution_ci_tools_arm64.erb

Testing

X86 build

~> ./docker/scripts/generate-dockerfile docker/Dockerfile_distribution_ci_tools.erb
~> docker build -f docker/Dockerfile_distribution_ci_tools -t distribution_ci_tools:test docker
~> docker run --rm distribution_ci_tools:test helm version
version.BuildInfo{Version:"v4.1.4", GitCommit:"05fa37973dc9e42b76e1d2883494c87174b6074f", GitTreeState:"clean", GoVersion:"go1.25.9", KubeClientVersion:"v1.35"}

arm64 build

~> ./docker/scripts/generate-dockerfile docker/Dockerfile_distribution_ci_tools_arm64.erb
~> docker build -f docker/Dockerfile_distribution_ci_tools_arm64 -t distribution_ci_tools_arm64:test docker
~> docker run --rm distribution_ci_tools_arm64:test helm version
version.BuildInfo{Version:"v4.1.4", GitCommit:"05fa37973dc9e42b76e1d2883494c87174b6074f", GitTreeState:"clean", GoVersion:"go1.25.9", KubeClientVersion:"v1.35"}
Edited by Manjunath Bhadrannavar

Merge request reports

Loading