diff --git a/.github/workflows/Makefile b/.github/workflows/Makefile index e20718c2..659bc2a1 100644 --- a/.github/workflows/Makefile +++ b/.github/workflows/Makefile @@ -1,4 +1,4 @@ -HELM_VERSION ?= v4.0.1 +HELM_VERSION ?= v4.0.4 KUSTOMIZE_VERSION ?= v5.8.0 K8S_VERSION ?= v1.34.0 MINIKUBE_VERSION ?= v1.37.0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a2799b7..f89f1113 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - helm-version: [v3.18.6, v3.19.2, v4.0.1] + helm-version: [v3.18.6, v3.19.2, v4.0.4] steps: - uses: actions/checkout@v6 with: @@ -67,16 +67,16 @@ jobs: env: HELMFILE_HELM4: ${{ startsWith(matrix.helm-version, 'v4') && '1' || '0' }} - name: Archive built binaries - if: matrix.helm-version == 'v4.0.1' + if: matrix.helm-version == 'v4.0.4' run: tar -cvf built-binaries.tar helmfile diff-yamls dyff - uses: actions/upload-artifact@v6 - if: matrix.helm-version == 'v4.0.1' + if: matrix.helm-version == 'v4.0.4' with: name: built-binaries-${{ github.run_id }} path: built-binaries.tar retention-days: 1 - name: Display built binaries - if: matrix.helm-version == 'v4.0.1' + if: matrix.helm-version == 'v4.0.4' run: ls -l helmfile diff-yamls dyff integration_tests: @@ -116,12 +116,12 @@ jobs: plugin-diff-version: 3.14.1 extra-helmfile-flags: '--enable-live-output' # Helmfile now supports both Helm 3.x and Helm 4.x - - helm-version: v4.0.1 + - helm-version: v4.0.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.14.1 extra-helmfile-flags: '' - - helm-version: v4.0.1 + - helm-version: v4.0.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.14.1 diff --git a/Dockerfile b/Dockerfile index 15bb8813..4c76f4f8 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="v4.0.1" +ARG HELM_VERSION="v4.0.4" ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_BIN="/usr/local/bin/helm" ARG HELM_LOCATION="https://get.helm.sh" @@ -39,8 +39,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="e0365548f01ed52a58a1181ad310b604a3244f59257425bb1739499372bdff60" ;; \ - "linux/arm64") HELM_SHA256="959fa52d34e2e1f0154e3220ed5f22263c8593447647a43af07890bba4b004d1" ;; \ + "linux/amd64") HELM_SHA256="29454bc351f4433e66c00f5d37841627cbbcc02e4c70a6d796529d355237671c" ;; \ + "linux/arm64") HELM_SHA256="16b88acc6503d646b7537a298e7389bef469c5cc9ebadf727547abe9f6a35903" ;; \ 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 e4d3b3f9..df01ceb4 100644 --- a/Dockerfile.debian-stable-slim +++ b/Dockerfile.debian-stable-slim @@ -38,7 +38,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="v4.0.1" +ARG HELM_VERSION="v4.0.4" ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_BIN="/usr/local/bin/helm" ARG HELM_LOCATION="https://get.helm.sh" @@ -47,8 +47,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="e0365548f01ed52a58a1181ad310b604a3244f59257425bb1739499372bdff60" ;; \ - "linux/arm64") HELM_SHA256="959fa52d34e2e1f0154e3220ed5f22263c8593447647a43af07890bba4b004d1" ;; \ + "linux/amd64") HELM_SHA256="29454bc351f4433e66c00f5d37841627cbbcc02e4c70a6d796529d355237671c" ;; \ + "linux/arm64") HELM_SHA256="16b88acc6503d646b7537a298e7389bef469c5cc9ebadf727547abe9f6a35903" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 3332e00c..d7c39246 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -38,7 +38,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="v4.0.1" +ARG HELM_VERSION="v4.0.4" ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_BIN="/usr/local/bin/helm" ARG HELM_LOCATION="https://get.helm.sh" @@ -47,8 +47,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="e0365548f01ed52a58a1181ad310b604a3244f59257425bb1739499372bdff60" ;; \ - "linux/arm64") HELM_SHA256="959fa52d34e2e1f0154e3220ed5f22263c8593447647a43af07890bba4b004d1" ;; \ + "linux/amd64") HELM_SHA256="29454bc351f4433e66c00f5d37841627cbbcc02e4c70a6d796529d355237671c" ;; \ + "linux/arm64") HELM_SHA256="16b88acc6503d646b7537a298e7389bef469c5cc9ebadf727547abe9f6a35903" ;; \ 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 22e40109..0a942b2b 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -20,7 +20,7 @@ import ( const ( HelmRequiredVersion = "v3.18.6" // Minimum required version (supports Helm 3.x and 4.x) HelmDiffRecommendedVersion = "v3.14.1" - HelmRecommendedVersion = "v4.0.1" // Recommended to use latest Helm 4 + HelmRecommendedVersion = "v4.0.4" // Recommended to use latest Helm 4 HelmSecretsRecommendedVersion = "v4.7.4" // v4.7.0+ works with both Helm 3 (single plugin) and Helm 4 (split plugin architecture) HelmGitRecommendedVersion = "v1.3.0" HelmS3RecommendedVersion = "v0.16.3"