From 166f373e1c365af98d9a8e604dad47cad68b3ff4 Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@gitlab.com>
Date: Fri, 3 Jun 2022 11:13:10 -0400
Subject: [PATCH] Remove deprecated Dockerfiles

- Remove two Dockerfiles that are no longer built

Related https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/532

Related https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/387

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
---
 Dockerfile.gitlab-charts-build-base | 29 -----------------------
 Dockerfile.gitlab-helm3-kubectl1.14 | 36 -----------------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 Dockerfile.gitlab-charts-build-base
 delete mode 100644 Dockerfile.gitlab-helm3-kubectl1.14

diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base
deleted file mode 100644
index 63e30de..0000000
--- a/Dockerfile.gitlab-charts-build-base
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ruby:2.6.5-alpine
-MAINTAINER GitLab Distribution Team
-
-ENV HELM_VERSION=2.16.9
-ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
-ENV HELM_HOME=/root/.helm
-
-# kubectl (possibly in gcloud?)
-ENV KUBECTL_VERSION=1.16.4
-ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
-
-# Install dependencies
-RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python3\
-  && mkdir -p /opt
-
-# Install kubectl
-RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \
-  && chmod +x /usr/local/bin/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
diff --git a/Dockerfile.gitlab-helm3-kubectl1.14 b/Dockerfile.gitlab-helm3-kubectl1.14
deleted file mode 100644
index b56006b..0000000
--- a/Dockerfile.gitlab-helm3-kubectl1.14
+++ /dev/null
@@ -1,36 +0,0 @@
-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 python3 \
-  && 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