Skip to content

Commit

Permalink
Merge pull request #618 from wyardley/wyardley/helm-updates
Browse files Browse the repository at this point in the history
fix(helm): update to 3.12.0 and use gcloud auth plugin
  • Loading branch information
ronanww authored May 15, 2023
2 parents 1dbc678 + 1b7d8ac commit 4b1f90c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions helm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
FROM gcr.io/cloud-builders/gcloud

ARG HELM_VERSION=v3.7.0
ARG HELM_VERSION=v3.12.0
ENV HELM_VERSION=$HELM_VERSION
ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True

COPY helm.bash /builder/helm.bash

RUN chmod +x /builder/helm.bash && \
mkdir -p /builder/helm && \
apt-get update && \
apt-get install -y curl && \
apt-get install -y --no-install-recommends curl && \
curl -SL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz -o helm.tar.gz && \
tar zxvf helm.tar.gz --strip-components=1 -C /builder/helm linux-amd64 && \
rm helm.tar.gz && \
apt-get --purge -y autoremove && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN gcloud -q components install gke-gcloud-auth-plugin

ENV PATH=/builder/helm/:$PATH

ENTRYPOINT ["/builder/helm.bash"]
2 changes: 1 addition & 1 deletion helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To build this builder, run the following command in this directory.

You can also build this builder setting `Helm` version via in `cloudbuild.yaml`, no need to do that in `Dockerfile` anymore.

args: ['build', '--tag=gcr.io/$PROJECT_ID/helm', '--build-arg', 'HELM_VERSION=v2.10.0', '.']
args: ['build', '--tag=gcr.io/$PROJECT_ID/helm', '--build-arg', 'HELM_VERSION=v3.12.0', '.']

## Using Helm

Expand Down
2 changes: 1 addition & 1 deletion helm/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ images:
- 'gcr.io/$PROJECT_ID/helm:latest'
tags: ['cloud-builders-community']
substitutions:
_HELM_VERSION: 3.7.0
_HELM_VERSION: 3.12.0

0 comments on commit 4b1f90c

Please sign in to comment.