From 495dbe57f0f50254c23ce24eb68c65fd5719bbe1 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Tue, 21 Jun 2022 07:23:56 +0000 Subject: [PATCH] Deprecate gitlab-charts-build-base-helm-3 (Helm 3.4) image tag Signed-off-by: Takuya Noguchi --- .gitlab/ci/custom.images.yml | 2 -- Dockerfile.gitlab-charts-build-base-helm-3 | 32 ---------------------- 2 files changed, 34 deletions(-) delete mode 100644 Dockerfile.gitlab-charts-build-base-helm-3 diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 484d639..a65447e 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -21,8 +21,6 @@ danger: danger-ruby-2.6.6: extends: .build_and_deploy -gitlab-charts-build-base-helm-3: - extends: .build_and_deploy gitlab-charts-build-base-helm-3.7: extends: .build_and_deploy diff --git a/Dockerfile.gitlab-charts-build-base-helm-3 b/Dockerfile.gitlab-charts-build-base-helm-3 deleted file mode 100644 index 40d30ac..0000000 --- a/Dockerfile.gitlab-charts-build-base-helm-3 +++ /dev/null @@ -1,32 +0,0 @@ -FROM ruby:2.6.5-alpine -MAINTAINER GitLab Distribution Team - -ENV HELM_VERSION=3.4.1 -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 py3-pip groff\ - && 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 - -# Install aws cli -RUN pip3 install awscli