From 74985fc54cf23f76507989f0383188c35ffef3ba Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:33:00 +0800 Subject: [PATCH] build: update Helm to v3.18.2 and adjust related configurations (#2064) * build: update Helm to v3.18.2 and adjust related configurations Signed-off-by: yxxhero * fix tests Signed-off-by: yxxhero --------- Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 6 +++--- Dockerfile | 6 +++--- Dockerfile.debian-stable-slim | 6 +++--- Dockerfile.ubuntu | 6 +++--- pkg/app/init.go | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a4e16301..c065cfc2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -69,19 +69,19 @@ jobs: plugin-secrets-version: 4.6.5 plugin-diff-version: 3.12.1 extra-helmfile-flags: '' - - helm-version: v3.18.1 + - helm-version: v3.18.2 kustomize-version: v5.2.1 plugin-secrets-version: 4.6.5 plugin-diff-version: 3.11.0 extra-helmfile-flags: '' - - helm-version: v3.18.1 + - helm-version: v3.18.2 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.5 plugin-diff-version: 3.12.1 extra-helmfile-flags: '' # In case you need to test some optional helmfile features, # enable it via extra-helmfile-flags below. - - helm-version: v3.18.1 + - helm-version: v3.18.2 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.5 plugin-diff-version: 3.12.1 diff --git a/Dockerfile b/Dockerfile index d5775b00..d321e541 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}" ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ENV HELM_DATA_HOME="${HELM_DATA_HOME}" -ARG HELM_VERSION="v3.18.1" +ARG HELM_VERSION="v3.18.2" ENV HELM_VERSION="${HELM_VERSION}" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" @@ -38,8 +38,8 @@ RUN set -x && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ echo Verifying ${HELM_FILENAME}... && \ case ${TARGETPLATFORM} in \ - "linux/amd64") HELM_SHA256="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ - "linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ + "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \ + "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.debian-stable-slim b/Dockerfile.debian-stable-slim index aeaa6826..c84cfdd0 100644 --- a/Dockerfile.debian-stable-slim +++ b/Dockerfile.debian-stable-slim @@ -35,7 +35,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}" ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ENV HELM_DATA_HOME="${HELM_DATA_HOME}" -ARG HELM_VERSION="v3.18.1" +ARG HELM_VERSION="v3.18.2" ENV HELM_VERSION="${HELM_VERSION}" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" @@ -43,8 +43,8 @@ RUN set -x && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ echo Verifying ${HELM_FILENAME}... && \ case ${TARGETPLATFORM} in \ - "linux/amd64") HELM_SHA256="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ - "linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ + "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \ + "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index a9cb1276..9995bfb8 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -35,7 +35,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}" ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ENV HELM_DATA_HOME="${HELM_DATA_HOME}" -ARG HELM_VERSION="v3.18.1" +ARG HELM_VERSION="v3.18.2" ENV HELM_VERSION="${HELM_VERSION}" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" @@ -43,8 +43,8 @@ RUN set -x && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ echo Verifying ${HELM_FILENAME}... && \ case ${TARGETPLATFORM} in \ - "linux/amd64") HELM_SHA256="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ - "linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ + "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \ + "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/pkg/app/init.go b/pkg/app/init.go index 368ac27f..9c28a25c 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -18,7 +18,7 @@ import ( const ( HelmRequiredVersion = "v3.17.3" - HelmRecommendedVersion = "v3.18.1" + HelmRecommendedVersion = "v3.18.2" HelmDiffRecommendedVersion = "v3.12.1" HelmSecretsRecommendedVersion = "v4.6.5" HelmGitRecommendedVersion = "v1.3.0"