diff --git a/.github/workflows/Makefile b/.github/workflows/Makefile index 7fe032ca..87f3378d 100644 --- a/.github/workflows/Makefile +++ b/.github/workflows/Makefile @@ -1,4 +1,4 @@ -HELM_VERSION ?= v4.2.2 +HELM_VERSION ?= v4.2.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 7a491fc1..03a3356f 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.21.3, v4.2.3] + helm-version: [v3.18.6, v3.21.4, v4.2.4] steps: - uses: actions/checkout@v7 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.2.3' + if: matrix.helm-version == 'v4.2.4' run: tar -cvf built-binaries.tar helmfile diff-yamls dyff - uses: actions/upload-artifact@v7 - if: matrix.helm-version == 'v4.2.3' + if: matrix.helm-version == 'v4.2.4' with: name: built-binaries-${{ github.run_id }} path: built-binaries.tar retention-days: 1 - name: Display built binaries - if: matrix.helm-version == 'v4.2.3' + if: matrix.helm-version == 'v4.2.4' run: ls -l helmfile diff-yamls dyff integration_tests: @@ -105,23 +105,23 @@ jobs: plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.11 extra-helmfile-flags: '--enable-live-output' - - helm-version: v3.21.3 + - helm-version: v3.21.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.11 extra-helmfile-flags: '' - - helm-version: v3.21.3 + - helm-version: v3.21.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.11 extra-helmfile-flags: '--enable-live-output' # Helmfile now supports both Helm 3.x and Helm 4.x - - helm-version: v4.2.3 + - helm-version: v4.2.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.11 extra-helmfile-flags: '' - - helm-version: v4.2.3 + - helm-version: v4.2.4 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.11 diff --git a/Dockerfile b/Dockerfile index 5b6c9743..41a09892 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.2.3" +ARG HELM_VERSION="v4.2.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="e9b88b4ee95b18c706839c28d3a0220e5bc470e9cd9262410c90793c45ff8b7c" ;; \ - "linux/arm64") HELM_SHA256="21abd9354d39b2cd79a8d76be6912cd137a983cbf997193503fb8a6a6e2f2785" ;; \ + "linux/amd64") HELM_SHA256="c306b46f719b0a4da32d0f78ee21bf90ce8d602f15b22ab753f0674d1670a7f3" ;; \ + "linux/arm64") HELM_SHA256="564de2191b881e9f71b5606b25345821ea1682f06ab90499d3ab22b530176da1" ;; \ 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 8ec3ccaa..62dae23a 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.2.3" +ARG HELM_VERSION="v4.2.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="e9b88b4ee95b18c706839c28d3a0220e5bc470e9cd9262410c90793c45ff8b7c" ;; \ - "linux/arm64") HELM_SHA256="21abd9354d39b2cd79a8d76be6912cd137a983cbf997193503fb8a6a6e2f2785" ;; \ + "linux/amd64") HELM_SHA256="c306b46f719b0a4da32d0f78ee21bf90ce8d602f15b22ab753f0674d1670a7f3" ;; \ + "linux/arm64") HELM_SHA256="564de2191b881e9f71b5606b25345821ea1682f06ab90499d3ab22b530176da1" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index b7eba7e2..606e9ab9 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.2.3" +ARG HELM_VERSION="v4.2.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="e9b88b4ee95b18c706839c28d3a0220e5bc470e9cd9262410c90793c45ff8b7c" ;; \ - "linux/arm64") HELM_SHA256="21abd9354d39b2cd79a8d76be6912cd137a983cbf997193503fb8a6a6e2f2785" ;; \ + "linux/amd64") HELM_SHA256="c306b46f719b0a4da32d0f78ee21bf90ce8d602f15b22ab753f0674d1670a7f3" ;; \ + "linux/arm64") HELM_SHA256="564de2191b881e9f71b5606b25345821ea1682f06ab90499d3ab22b530176da1" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/go.mod b/go.mod index cfbd853a..4f6b76ec 100644 --- a/go.mod +++ b/go.mod @@ -37,8 +37,8 @@ require ( golang.org/x/sync v0.22.0 golang.org/x/term v0.45.0 gopkg.in/yaml.v3 v3.0.1 - helm.sh/helm/v3 v3.21.3 - helm.sh/helm/v4 v4.2.3 + helm.sh/helm/v3 v3.21.4 + helm.sh/helm/v4 v4.2.4 k8s.io/apimachinery v0.36.2 k8s.io/client-go v0.36.2 ) diff --git a/go.sum b/go.sum index 26259fad..8b069f6f 100644 --- a/go.sum +++ b/go.sum @@ -1063,10 +1063,10 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -helm.sh/helm/v3 v3.21.3 h1:wkamdwI3liEkW6wI1l9aGqQZGxcTKyt8kx0qJLPcmCg= -helm.sh/helm/v3 v3.21.3/go.mod h1:iaJ0iNsPoTZl++7h6vzQFyT0VEVtLYJiyRBDkPOOBTs= -helm.sh/helm/v4 v4.2.3 h1:JEejtPE04+SvyRomOfgRXVxyJ/lude7eShio30oQr0Y= -helm.sh/helm/v4 v4.2.3/go.mod h1:azI2XpxowOGXAgzeXcqyfskUmIfILqIcJxiFw1M6PuM= +helm.sh/helm/v3 v3.21.4 h1:T/GcIEXU/gNjJnkITlIZ3e9xqkZjhFTmISuStTZ6+Qg= +helm.sh/helm/v3 v3.21.4/go.mod h1:cS2FBb+xfLuaSqvEmbqIeKUVFgHdHVHtVeXb2epof3M= +helm.sh/helm/v4 v4.2.4 h1:qIysMI0JpTC4WXf3AQ99V6rZGT0+gO0Ww8IOnnUnaZk= +helm.sh/helm/v4 v4.2.4/go.mod h1:ZP8nFdYe7jG1PTQelKzQXQ7m09/ruhMTrpDAf+OL5ms= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988= diff --git a/pkg/app/init.go b/pkg/app/init.go index ec068183..b2b40941 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.15.11" - HelmRecommendedVersion = "v4.2.3" // Recommended Helm 4 version + HelmRecommendedVersion = "v4.2.4" // Recommended Helm 4 version 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" diff --git a/pkg/helmexec/exec_test.go b/pkg/helmexec/exec_test.go index 270d1a8e..b9ff4b02 100644 --- a/pkg/helmexec/exec_test.go +++ b/pkg/helmexec/exec_test.go @@ -2046,7 +2046,7 @@ func Test_UpdatePlugin_NotFoundUninstallProceedsToInstall(t *testing.T) { version string msg string }{ - {name: "helm4", version: "4.2.3", msg: "plugin: diff not found"}, + {name: "helm4", version: "4.2.4", msg: "plugin: diff not found"}, {name: "helm3", version: "3.16.4", msg: "Plugin: diff not found"}, } { t.Run(tc.name, func(t *testing.T) {