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

Add a newer version of Helm for the charts base images.

Browse source 
And stop building Helm 2
This commit is contained in:
DJ Mountney 2022-05-06 15:24:22 -07:00
parent 3ef3959519
commit f54a69a36c
No known key found for this signature in database
GPG key ID: F07F8D51346CF0B6
2 changed files with 54 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,14 +19,20 @@
alpine-helm test: alpine-helm test:
extends: .test_build extends: .test_build
# Used by charts CI
# - https://gitlab.com/gitlab-org/charts/elastic-stack/-/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/charts/gitlab/-/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/charts/gitlab-runner/-/blob/main/.gitlab-ci.yml
# - https://gitlab.com/charts/charts.gitlab.io/-/blob/master/.gitlab-ci.yml
gitlab-charts-build-base-helm-3 test:
extends: .test_build
gitlab-charts-build-base-helm-3.7 test:
extends: .test_build
danger test: danger test:
extends: .test_build extends: .test_build
danger-ruby-2.6.6 test: danger-ruby-2.6.6 test:
extends: .test_build extends: .test_build
gitlab-charts-build-base test:
extends: .test_build
gitlab-charts-build-base-helm-3 test:
extends: .test_build
gitlab-helm3.5-kubectl1.17 test: gitlab-helm3.5-kubectl1.17 test:
extends: .test_build extends: .test_build
gitlab-qa-ruby-2.7 test: gitlab-qa-ruby-2.7 test:
@ -107,18 +113,24 @@ alpine-helm push:
extends: .build_and_deploy extends: .build_and_deploy
needs: ["alpine-helm test"] needs: ["alpine-helm test"]
# Used by charts CI
# - https://gitlab.com/gitlab-org/charts/elastic-stack/-/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/charts/gitlab/-/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/charts/gitlab-runner/-/blob/main/.gitlab-ci.yml
# - https://gitlab.com/charts/charts.gitlab.io/-/blob/master/.gitlab-ci.yml
gitlab-charts-build-base-helm-3 push:
extends: .build_and_deploy
needs: ["gitlab-charts-build-base-helm-3 test"]
gitlab-charts-build-base-helm-3.7 push:
extends: .build_and_deploy
needs: ["gitlab-charts-build-base-helm-3.7 test"]
danger push: danger push:
extends: .build_and_deploy extends: .build_and_deploy
needs: ["danger test"] needs: ["danger test"]
danger-ruby-2.6.6 push: danger-ruby-2.6.6 push:
extends: .build_and_deploy extends: .build_and_deploy
needs: ["danger-ruby-2.6.6 test"] needs: ["danger-ruby-2.6.6 test"]
gitlab-charts-build-base push:
extends: .build_and_deploy
needs: ["gitlab-charts-build-base test"]
gitlab-charts-build-base-helm-3 push:
extends: .build_and_deploy
needs: ["gitlab-charts-build-base-helm-3 test"]
gitlab-helm3.5-kubectl1.17 push: gitlab-helm3.5-kubectl1.17 push:
extends: .build_and_deploy extends: .build_and_deploy
needs: ["gitlab-helm3.5-kubectl1.17 test"] needs: ["gitlab-helm3.5-kubectl1.17 test"]

32
Dockerfile.gitlab-charts-build-base-helm-3.7 Normal file
View file

@ -0,0 +1,32 @@
FROM ruby:2.7.6-alpine
MAINTAINER GitLab Distribution Team
ENV HELM_VERSION=3.7.2
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.20.15
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 python2 py-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 pip install awscli