Merge branch 'add-job-for-gitlab-gcloud-helm3.5-kubectl1.17' into 'master'

Add a way to install Helm and add a job to build Review App related images

See merge request gitlab-org/gitlab-build-images!554

.gitlab-ci.yml

@@ -16,6 +16,7 @@ stages:
   - custom
   - gitlab
   - gitlab-assets
+  - gitlab-review-app
   - gitaly
   - automation
 

.gitlab/ci/gitlab.images.yml

@@ -34,3 +34,14 @@ gitlab-assets:
         RUBY: ['2.7', '3.0']
         GIT: ['2.33']
         NODE: ['16.14']
+
+# Used by GitLab's Review app jobs
+gitlab-review-app:
+  extends:
+    - .build_and_push
+  stage: gitlab-review-app
+  variables:
+    RUBY: '3.0'
+    GCLOUD: '383'
+    KUBECTL: '1.23'
+    HELM: '3.5'

Dockerfile.custom

@@ -99,6 +99,12 @@ ARG KUBECTL_DOWNLOAD_SHA256
 
 RUN if [ -n "$KUBECTL_VERSION" ] ; then /scripts/install-kubectl $KUBECTL_VERSION $KUBECTL_DOWNLOAD_SHA256; fi
 
+# Helm
+ARG HELM_VERSION
+ARG HELM_DOWNLOAD_SHA256
+
+RUN if [ -n "$HELM_VERSION" ] ; then /scripts/install-helm $HELM_VERSION $HELM_DOWNLOAD_SHA256; fi
+
 RUN locale-gen C.UTF-8
 ENV LANG=C.UTF-8 \
   LANGUAGE=C \
@@ -122,4 +128,5 @@ ENV RUBY_VERSION=${RUBY_VERSION} \
   BAZELISK_VERSION=${BAZELISK_VERSION} \
   GCLOUD_VERSION=${GCLOUD_VERSION} \
   KUBECTL_VERSION=${KUBECTL_VERSION} \
-  DEBIAN_VERSION=${DEBIAN_VERSION}
+  CUSTOM_IMAGE_NAME=${CUSTOM_IMAGE_NAME} \
+  CUSTOM_IMAGE_VERSION=${CUSTOM_IMAGE_VERSION}

Dockerfile.gitlab-gcloud-helm3.5-kubectl1.17

@@ -1,39 +0,0 @@
-FROM ruby:3.0.0-alpine
-MAINTAINER GitLab Engineering Productivity Team
-
-ENV GCLOUD_VERSION=354.0.0
-ENV GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
-
-ENV KUBECTL_VERSION=1.17.17
-
-ENV HELM_VERSION=3.5.3
-ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
-ENV HELM_HOME=/root/.helm
-
-# Install dependencies
-RUN apk --no-cache -U add openssl curl tar gzip bash ca-certificates git \
-  && mkdir -p /opt
-
-# Install Google Cloud SDK
-RUN curl ${GCLOUD_URL} > /tmp/google-cloud-sdk.tar.gz
-RUN mkdir -p /usr/local/gcloud \
-  && tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \
-  && /usr/local/gcloud/google-cloud-sdk/install.sh
-ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
-
-RUN gcloud version
-
-# Install kubectl
-RUN wget https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
-  && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl \
-  && rm -f kubectl
-
-# Install Helm
-RUN wget -q -O - ${HELM_URL} | tar zxf - \
-  && mv linux-amd64/helm /usr/bin/ \
-  && chmod +x /usr/bin/helm \
-  && helm version --client
-
-# Install kubeval
-RUN mkdir -p $HELM_HOME/plugins \
-  && helm plugin install https://github.com/instrumenta/helm-kubeval

scripts/install-helm

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -xeou pipefail
+
+HELM_VERSION=${1}
+HELM_DOWNLOAD_SHA256=${2}
+HELM_DOWNLOAD_URL="https://get.helm.sh/helm-v${HELM_VERSION}-linux-$(dpkg --print-architecture).tar.gz"
+
+curl -fsSL "${HELM_DOWNLOAD_URL}" -o helm.tar.gz
+echo "${HELM_DOWNLOAD_SHA256}  helm.tar.gz" | sha256sum -c -
+
+
+tar -xzf helm.tar.gz --strip-components=1
+rm helm.tar.gz
+
+chmod +x helm
+mv helm /usr/bin/
+
+helm version --client

scripts/lib/custom-docker-build

@@ -284,6 +284,22 @@ function print_kubectl_args() {
     printf -- "--build-arg KUBECTL_DOWNLOAD_SHA256=%s " "${KUBECTL_DOWNLOAD_SHA256[$CUSTOM_DOCKER_ARCH]}"
 }
 
+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
+            ;;
+        *) echo "Unknown helm version $1"; exit 1;
+    esac
+
+    printf -- "--build-arg HELM_VERSION=%s " "$HELM_VERSION"
+    printf -- "--build-arg HELM_DOWNLOAD_SHA256=%s " "${HELM_DOWNLOAD_SHA256[$CUSTOM_DOCKER_ARCH]}"
+}
+
 function parse_arguments() {
     printf -- "-f Dockerfile.custom "
 
@@ -331,6 +347,7 @@ function parse_arguments() {
                 BAZELISK) print_bazelisk_args $version ;;
                 GCLOUD) print_gcloud_args $version ;;
                 KUBECTL) print_kubectl_args $version ;;
+                HELM) print_helm_args $version ;;
                 *) echo "unknown tool $tool"; exit 1;;
             esac
         fi
@@ -340,7 +357,6 @@ function parse_arguments() {
 
     printf -- "--build-arg CUSTOM_IMAGE_NAME=%s " "$CUSTOM_IMAGE_NAME"
     printf -- "--build-arg CUSTOM_IMAGE_VERSION=%s " "$CUSTOM_IMAGE_VERSION"
-    printf -- "--build-arg DEBIAN_VERSION=%s " "$CUSTOM_IMAGE_VERSION"
 }
 
 function generate_command() {

scripts/lib/custom-docker.sh

@@ -1,5 +1,5 @@
 PATH_TOOLS=(DEBIAN RUBY GOLANG NODE POSTGRESQL)
-TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK PGBOUNCER BAZELISK DOCKER BUILDX GCLOUD KUBECTL)
+TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK PGBOUNCER BAZELISK DOCKER BUILDX GCLOUD KUBECTL HELM)
 
 function get_image_path() {
     local path