Merge branch 'new-helm3-charts-image' into 'master'

Add a new `gitlab-helm3-kubectl1.14` image

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

.gitlab-ci.yml

@@ -100,6 +100,7 @@ alpine-aws test: *test_build
 alpine-helm test: *test_build
 ruby-alpine-aws test: *test_build
 gitlab-charts-build-base test: *test_build
+gitlab-helm3-kubectl1.14 test: *test_build
 gitlab-qa-ruby-2.6 test: *test_build
 gitlab-qa-alpine-ruby-2.6 test: *test_build
 gitlab-puppeteer test: *test_build
@@ -164,6 +165,7 @@ alpine-aws: *build_and_deploy
 alpine-helm: *build_and_deploy
 ruby-alpine-aws: *build_and_deploy
 gitlab-charts-build-base: *build_and_deploy
+gitlab-helm3-kubectl1.14: *build_and_deploy
 gitlab-qa-ruby-2.6: *build_and_deploy
 gitlab-qa-alpine-ruby-2.6: *build_and_deploy
 gitlab-puppeteer: *build_and_deploy

Dockerfile.gitlab-charts-build-base

@@ -1,8 +1,8 @@
-FROM ruby:2.4.5-alpine
+FROM ruby:2.6.5-alpine
 MAINTAINER GitLab Distribution Team
 
 ENV HELM_VERSION=2.16.1
-ENV HELM_URL=https://kubernetes-helm.storage.googleapis.com/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
 
 # kubectl (possibly in gcloud?)

Dockerfile.gitlab-helm3-kubectl1.14

@@ -0,0 +1,36 @@
+FROM ruby:2.6.5-alpine
+MAINTAINER GitLab Engineering Productivity Team
+
+ENV GCLOUD_VERSION=286.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 HELM_VERSION=3.1.2
+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 add -U openssl curl tar gzip bash ca-certificates git python2 \
+  && 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 gcloud components install kubectl \
+  && kubectl version --client
+
+# 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