Bump minimum default version for Helm to 3.9.4

.gitlab/ci/cng-images.yml

@@ -11,7 +11,7 @@
     GIT: '2.33'
     GOLANG: '1.18'
     KUBECTL: '1.23'
-    HELM: '3.5'
+    HELM: '3.9'
 
 gitlab-cng:
   extends:

.gitlab/ci/custom.images.yml

@@ -4,7 +4,7 @@ danger:
 gitlab-charts-build-base-helm-3.9:
   extends: .build_static_image
 
-gitlab-helm3.5-kubectl1.17:
+gitlab-helm3.9-kubectl1.23:
   extends: .build_static_image
 
 gitlab-vscode-nodeless:

.gitlab/ci/gitlab.images.yml

@@ -74,7 +74,7 @@ gitlab-review-app:
     RUBY: '3.0'
     GCLOUD: '383'
     KUBECTL: '1.23'
-    HELM: '3.5'
+    HELM: '3.9'
 
 # Used by GitLab's jobs that work with ruby gems
 gitlab-slim-ruby:

Dockerfile.gitlab-helm3.9-kubectl1.23

@@ -1,9 +1,9 @@
-FROM ruby:3.0.0-alpine
+FROM ruby:3.1-alpine
 MAINTAINER GitLab Engineering Productivity Team
 
-ENV KUBECTL_VERSION=1.17.17
+ENV KUBECTL_VERSION=1.23.0
 
-ENV HELM_VERSION=3.5.3
+ENV HELM_VERSION=3.9.4
 ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
 ENV HELM_HOME=/root/.helm
 

Dockerfile.gitlab-operator-build-base-golang-1.20

@@ -43,10 +43,10 @@ FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build
 LABEL maintainer="GitLab Distribution Team" \
       description="Build base image for the GitLab Operator project."
 
-ARG KUBERNETES_VERSION=1.21.4
+ARG KUBERNETES_VERSION=1.23.1
 ARG KUBEBUILDER_VERSION=3.12.0
 ARG YQ_VERSION=4.7.0
-ARG HELM_VERSION=3.5.2
+ARG HELM_VERSION=3.9.4
 ARG OPERATORSDK_VERSION=1.32.0
 ARG TASK_VERSION=3.12.1
 ENV VCLUSTER_VERSION=0.16.3

scripts/lib/custom-docker-build

@@ -323,10 +323,10 @@ function print_helm_args() {
     declare -A HELM_DOWNLOAD_SHA256
 
     case "$1" in
-        3.5)
-            HELM_VERSION=3.5.3
-            HELM_DOWNLOAD_SHA256[amd64]=2170a1a644a9e0b863f00c17b761ce33d4323da64fc74562a3a6df2abbf6cd70
-            HELM_DOWNLOAD_SHA256[arm64]=e1348d94ce4caace43689ee2dfa5f8bcd8687c12053d9c13d79875b65d6b72aa
+        3.9)
+            HELM_VERSION=3.9.4
+            HELM_DOWNLOAD_SHA256[amd64]=31960ff2f76a7379d9bac526ddf889fb79241191f1dbe2a24f7864ddcb3f6560
+            HELM_DOWNLOAD_SHA256[arm64]=d24163e466f7884c55079d1050968e80a05b633830047116cdfd8ae28d35b0c0
             ;;
         *) fail "Unknown helm version $1" ;;
     esac