From 26f89e7e5d31a555b81100763e166019a14da550 Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:03:09 +0800 Subject: [PATCH] bump helm to 3.13.2 (#1130) Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 8 ++++---- Dockerfile | 6 +++--- Dockerfile.debian-stable-slim | 6 +++--- Dockerfile.ubuntu | 6 +++--- pkg/app/init.go | 2 +- pkg/state/state_test.go | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1ea3ed3..2a463583 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,20 +71,20 @@ jobs: plugin-diff-version: 3.8.1 extra-helmfile-flags: '' v1mode: '' - - helm-version: v3.13.1 + - helm-version: v3.13.2 kustomize-version: v4.4.1 plugin-secrets-version: 3.15.0 plugin-diff-version: 3.7.0 extra-helmfile-flags: '' v1mode: '' - - helm-version: v3.13.1 + - helm-version: v3.13.2 kustomize-version: v4.5.7 plugin-secrets-version: 4.0.0 plugin-diff-version: 3.8.1 extra-helmfile-flags: '' v1mode: '' # Helmfile v1 - - helm-version: v3.13.1 + - helm-version: v3.13.2 kustomize-version: v4.5.7 plugin-secrets-version: 4.0.0 plugin-diff-version: 3.8.1 @@ -92,7 +92,7 @@ jobs: v1mode: 'true' # In case you need to test some optional helmfile features, # enable it via extra-helmfile-flags below. - - helm-version: v3.13.1 + - helm-version: v3.13.2 kustomize-version: v4.5.7 plugin-secrets-version: 4.0.0 plugin-diff-version: 3.8.1 diff --git a/Dockerfile b/Dockerfile index 0a0b3267..ebf6110b 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.13.1" +ARG HELM_VERSION="v3.13.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="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ - "linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ + "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \ + "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \ 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 7bb880b9..7cd08397 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.13.1" +ARG HELM_VERSION="v3.13.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="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ - "linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ + "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \ + "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index a35699bd..4e162229 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.13.1" +ARG HELM_VERSION="v3.13.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="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ - "linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ + "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \ + "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \ 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 af10eba5..bd34cd08 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -18,7 +18,7 @@ import ( const ( HelmRequiredVersion = "v3.12.3" - HelmRecommendedVersion = "v3.13.1" + HelmRecommendedVersion = "v3.13.2" HelmDiffRecommendedVersion = "v3.8.1" HelmSecretsRecommendedVersion = "v4.1.1" HelmGitRecommendedVersion = "v0.12.0" diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index c62c590c..ef6dfc33 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -3156,7 +3156,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) { }, }, }, - helmVersion: "3.13.1", + helmVersion: "3.13.2", expected: []struct { qualifiedChartName string chartName string @@ -3177,7 +3177,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) { }, }, }, - helmVersion: "3.13.1", + helmVersion: "3.13.2", wantErr: true, }, { @@ -3212,7 +3212,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) { }, }, }, - helmVersion: "3.13.1", + helmVersion: "3.13.2", expected: []struct { qualifiedChartName string chartName string