NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-08 17:42:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump minimum default version for Helm to 3.9.4

Browse source
This commit is contained in:
Ismael Posada Trobo 2023-11-29 06:34:48 +00:00 • committed by Balasankar 'Balu' C
parent 6a43e82acc
commit d74c76029d
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/cng-images.yml
View file

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

2
.gitlab/ci/custom.images.yml
View file

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

2
.gitlab/ci/gitlab.images.yml
View file

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

6
Dockerfile.gitlab-helm3.5-kubectl1.17 → Dockerfile.gitlab-helm3.9-kubectl1.23
View file

@ -1,9 +1,9 @@
FROM ruby:3.0.0-alpine FROM ruby:3.1-alpine
MAINTAINER GitLab Engineering Productivity Team 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_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
ENV HELM_HOME=/root/.helm ENV HELM_HOME=/root/.helm

4
Dockerfile.gitlab-operator-build-base-golang-1.20
View file

@ -43,10 +43,10 @@ FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build
LABEL maintainer="GitLab Distribution Team" \ LABEL maintainer="GitLab Distribution Team" \
description="Build base image for the GitLab Operator project." 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 KUBEBUILDER_VERSION=3.12.0
ARG YQ_VERSION=4.7.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 OPERATORSDK_VERSION=1.32.0
ARG TASK_VERSION=3.12.1 ARG TASK_VERSION=3.12.1
ENV VCLUSTER_VERSION=0.16.3 ENV VCLUSTER_VERSION=0.16.3

8
scripts/lib/custom-docker-build
View file

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