Skip to content

Commit 3776724

Browse files
committed
Bump helm and plugins to v4
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 3814745 commit 3776724

1 file changed

Lines changed: 17 additions & 19 deletions

File tree

Dockerfile

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG HELM_VERSION=v3.20.2
2-
ARG HELM_COMMIT=8fb76d6ab555577e98e23b7500009537a471feee
1+
ARG HELM_VERSION=v4.1.4
2+
ARG HELM_COMMIT=05fa37973dc9e42b76e1d2883494c87174b6074f
33

44
FROM alpine/git:2.49.1 AS helm-src
55
ARG HELM_VERSION
@@ -12,7 +12,7 @@ RUN git clone --branch "${HELM_VERSION}" --depth 1 https://github.com/helm/helm.
1212
fi && \
1313
printf '%s\n' "${GIT_COMMIT}" > /src/helm/.git-commit
1414

15-
FROM golang:1.25-alpine3.23 AS extract
15+
FROM golang:1.25-alpine3.23 AS helm
1616
ARG TARGETARCH
1717
ARG TARGETVARIANT
1818
ARG HELM_VERSION
@@ -30,41 +30,39 @@ RUN case "${TARGETARCH}${TARGETVARIANT:+/${TARGETVARIANT}}" in \
3030
GIT_COMMIT="$(cat .git-commit)" && \
3131
CGO_ENABLED=0 go build -trimpath \
3232
-ldflags "-w -s \
33-
-X helm.sh/helm/v3/internal/version.version=${HELM_VERSION} \
34-
-X helm.sh/helm/v3/internal/version.metadata= \
35-
-X helm.sh/helm/v3/internal/version.gitCommit=${GIT_COMMIT} \
36-
-X helm.sh/helm/v3/internal/version.gitTreeState=clean \
37-
-X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMajor=$((K8S_MODULES_MAJOR_VER + 1)) \
38-
-X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMinor=${K8S_MODULES_MINOR_VER} \
39-
-X helm.sh/helm/v3/pkg/chartutil.k8sVersionMajor=$((K8S_MODULES_MAJOR_VER + 1)) \
40-
-X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=${K8S_MODULES_MINOR_VER}" \
33+
-X helm.sh/helm/v4/internal/version.version=${HELM_VERSION} \
34+
-X helm.sh/helm/v4/internal/version.metadata= \
35+
-X helm.sh/helm/v4/internal/version.gitCommit=${GIT_COMMIT} \
36+
-X helm.sh/helm/v4/internal/version.gitTreeState=clean \
37+
-X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMajor=$((K8S_MODULES_MAJOR_VER + 1)) \
38+
-X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMinor=${K8S_MODULES_MINOR_VER} \
39+
-X helm.sh/helm/v4/pkg/chartutil.k8sVersionMajor=$((K8S_MODULES_MAJOR_VER + 1)) \
40+
-X helm.sh/helm/v4/pkg/chartutil.k8sVersionMinor=${K8S_MODULES_MINOR_VER}" \
4141
-o /usr/bin/helm ./cmd/helm
4242
COPY entry /usr/bin/
4343

4444
FROM golang:1.25-alpine3.23 AS plugins
4545
ARG TARGETARCH
4646
ARG HELM_VERSION
47-
COPY --from=extract /usr/bin/helm /usr/bin/helm
47+
COPY --from=helm /usr/bin/helm /usr/bin/helm
4848
RUN apk add -U curl ca-certificates build-base $([ "${TARGETARCH}" = "arm64" ] && echo binutils-gold)
4949
RUN go version
5050
RUN mkdir -p /go/src/github.com/k3s-io/helm-set-status && \
5151
cd /tmp && \
52-
curl -fsSL https://github.com/k3s-io/helm-set-status/archive/refs/tags/v0.3.0.tar.gz -o helm-set-status.tar.gz && \
53-
echo "56dfeabb802664b7c692607eafc823f784605181539070afaa369e62b4dfd0fb helm-set-status.tar.gz" | sha256sum -c - && \
52+
curl -fsSL https://github.com/k3s-io/helm-set-status/archive/3a3a40923262fcd0bdf729b538cda7dd4b15b047/helm-set-status.tar.gz -o helm-set-status.tar.gz && \
5453
tar xzf helm-set-status.tar.gz --strip-components=1 -C /go/src/github.com/k3s-io/helm-set-status && \
5554
rm -f /tmp/helm-set-status.tar.gz && \
5655
cd /go/src/github.com/k3s-io/helm-set-status && \
57-
go mod edit --replace helm.sh/helm/v3=helm.sh/helm/v3@${HELM_VERSION} && \
56+
go mod edit --replace helm.sh/helm/v4=helm.sh/helm/v4@"${HELM_VERSION}" && \
5857
go mod tidy && \
5958
make install
6059
RUN mkdir -p /go/src/github.com/helm/helm-mapkubeapis && \
6160
cd /tmp && \
62-
curl -fsSL https://github.com/helm/helm-mapkubeapis/archive/refs/tags/v0.6.1.tar.gz -o helm-mapkubeapis.tar.gz && \
63-
echo "261f4adb3a09a5b7c06a32464057c6f93c8fbde9c5776bd07b17fdcaad18ec02 helm-mapkubeapis.tar.gz" | sha256sum -c - && \
61+
curl -fsSL https://github.com/helm/helm-mapkubeapis/archive/a8a487a350db0ca85fb4247afb7e220d5f254b6f/helm-mapkubeapis.tar.gz -o helm-mapkubeapis.tar.gz && \
6462
tar xzf helm-mapkubeapis.tar.gz --strip-components=1 -C /go/src/github.com/helm/helm-mapkubeapis && \
6563
rm -f /tmp/helm-mapkubeapis.tar.gz && \
6664
cd /go/src/github.com/helm/helm-mapkubeapis && \
67-
go mod edit --replace helm.sh/helm/v3=helm.sh/helm/v3@${HELM_VERSION} && \
65+
go mod edit --replace helm.sh/helm/v4=helm.sh/helm/v4@"${HELM_VERSION}" && \
6866
go mod tidy && \
6967
make && \
7068
mkdir -p /root/.local/share/helm/plugins/helm-mapkubeapis && \
@@ -82,7 +80,7 @@ RUN apk --no-cache upgrade && \
8280
adduser -D -u 1000 -s /bin/bash klipper-helm
8381
WORKDIR /home/klipper-helm
8482
COPY --chown=1000:1000 --from=plugins /root/.local/share/helm/plugins/ /home/klipper-helm/.local/share/helm/plugins/
85-
COPY --from=extract /usr/bin/helm /usr/bin/entry /usr/bin/
83+
COPY --from=helm /usr/bin/helm /usr/bin/entry /usr/bin/
8684
ENTRYPOINT ["entry"]
8785
ENV STABLE_REPO_URL=https://charts.helm.sh/stable/
8886
ENV TIMEOUT=

0 commit comments

Comments
 (0)