From e12c8758636740e512af595f55ebe429dc0b06df Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Fri, 19 Jun 2026 07:06:30 +0800 Subject: [PATCH] build(deps): bump helm from v4.2.1 to v4.2.2 (#2651) * build(deps): bump helm from v4.2.1 to v4.2.2 Signed-off-by: yxxhero * build(deps): update helm v4.2.2 SHA256 checksums Signed-off-by: yxxhero --------- Signed-off-by: yxxhero --- .github/workflows/Makefile | 2 +- .github/workflows/ci.yaml | 12 ++++++------ Dockerfile | 6 +++--- Dockerfile.debian-stable-slim | 6 +++--- Dockerfile.ubuntu | 6 +++--- go.mod | 4 ++-- go.sum | 4 ++-- pkg/app/init.go | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/Makefile b/.github/workflows/Makefile index 179e3cd5..7fe032ca 100644 --- a/.github/workflows/Makefile +++ b/.github/workflows/Makefile @@ -1,4 +1,4 @@ -HELM_VERSION ?= v4.2.1 +HELM_VERSION ?= v4.2.2 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 594e5423..1c3331ec 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.1, v4.2.1] + helm-version: [v3.18.6, v3.21.1, v4.2.2] 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.1' + if: matrix.helm-version == 'v4.2.2' run: tar -cvf built-binaries.tar helmfile diff-yamls dyff - uses: actions/upload-artifact@v7 - if: matrix.helm-version == 'v4.2.1' + if: matrix.helm-version == 'v4.2.2' with: name: built-binaries-${{ github.run_id }} path: built-binaries.tar retention-days: 1 - name: Display built binaries - if: matrix.helm-version == 'v4.2.1' + if: matrix.helm-version == 'v4.2.2' run: ls -l helmfile diff-yamls dyff integration_tests: @@ -116,12 +116,12 @@ jobs: plugin-diff-version: 3.15.10 extra-helmfile-flags: '--enable-live-output' # Helmfile now supports both Helm 3.x and Helm 4.x - - helm-version: v4.2.1 + - helm-version: v4.2.2 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.10 extra-helmfile-flags: '' - - helm-version: v4.2.1 + - helm-version: v4.2.2 kustomize-version: v5.8.0 plugin-secrets-version: 4.7.4 plugin-diff-version: 3.15.10 diff --git a/Dockerfile b/Dockerfile index 46730681..45afc343 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.1" +ARG HELM_VERSION="v4.2.2" 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="479dca836e5b45e8bd222400c5591b0e3a647378f03ff96597180db97c17fdae" ;; \ - "linux/arm64") HELM_SHA256="596b9a73d366c1e72ce67d595c22805480e30914593aafbc9f547694e72814db" ;; \ + "linux/amd64") HELM_SHA256="9adafecab4d406853bba163a70e9f104f47dbbf65ce24b7653bae7e36150bcb6" ;; \ + "linux/arm64") HELM_SHA256="78803142087a0069fa4b50d3f32a84d3ef25c14d1ee8a40fbccf86a6216d2f36" ;; \ 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 16625a8d..af5d9e54 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.1" +ARG HELM_VERSION="v4.2.2" 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="479dca836e5b45e8bd222400c5591b0e3a647378f03ff96597180db97c17fdae" ;; \ - "linux/arm64") HELM_SHA256="596b9a73d366c1e72ce67d595c22805480e30914593aafbc9f547694e72814db" ;; \ + "linux/amd64") HELM_SHA256="9adafecab4d406853bba163a70e9f104f47dbbf65ce24b7653bae7e36150bcb6" ;; \ + "linux/arm64") HELM_SHA256="78803142087a0069fa4b50d3f32a84d3ef25c14d1ee8a40fbccf86a6216d2f36" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 6a41a2ae..46b177d4 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.1" +ARG HELM_VERSION="v4.2.2" 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="479dca836e5b45e8bd222400c5591b0e3a647378f03ff96597180db97c17fdae" ;; \ - "linux/arm64") HELM_SHA256="596b9a73d366c1e72ce67d595c22805480e30914593aafbc9f547694e72814db" ;; \ + "linux/amd64") HELM_SHA256="9adafecab4d406853bba163a70e9f104f47dbbf65ce24b7653bae7e36150bcb6" ;; \ + "linux/arm64") HELM_SHA256="78803142087a0069fa4b50d3f32a84d3ef25c14d1ee8a40fbccf86a6216d2f36" ;; \ esac && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo Extracting ${HELM_FILENAME}... && \ diff --git a/go.mod b/go.mod index c6c7f102..31366a03 100644 --- a/go.mod +++ b/go.mod @@ -37,14 +37,14 @@ require ( golang.org/x/term v0.44.0 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.21.1 - helm.sh/helm/v4 v4.2.1 + helm.sh/helm/v4 v4.2.2 k8s.io/apimachinery v0.36.1 k8s.io/client-go v0.36.1 ) replace ( // kubedog's flagger dependency still imports k8s.io/api/autoscaling/v2beta2, - // while Helm 4.2.1 requires k8s.io/apimachinery/content.IsPathSegmentName from v0.36+. + // while Helm 4.2.2 requires k8s.io/apimachinery/content.IsPathSegmentName from v0.36+. k8s.io/api => k8s.io/api v0.35.4 k8s.io/apimachinery => k8s.io/apimachinery v0.36.0 k8s.io/client-go => k8s.io/client-go v0.35.4 diff --git a/go.sum b/go.sum index b95c1946..e344e315 100644 --- a/go.sum +++ b/go.sum @@ -1057,8 +1057,8 @@ 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.1 h1:g4AE2nnAAqSEg3aSBUoqJAKpiEvAKuYeIjk6x9U+vj0= helm.sh/helm/v3 v3.21.1/go.mod h1:MUakFviBniZhRL89rFwl6XZZHorArkWCTIKKX7ugTq0= -helm.sh/helm/v4 v4.2.1 h1:esMHK7az2udPJvsRLA1EsxB7lJwqXcsb3biYnlFIjrg= -helm.sh/helm/v4 v4.2.1/go.mod h1:dp3ihfy1AhCLKANDaPETmVWhqPkOmwvJtpK/biHfopE= +helm.sh/helm/v4 v4.2.2 h1:E2zSCA2uUm9PNiZsSC/BioDVGsYk7nF2jNJFg/i+Dng= +helm.sh/helm/v4 v4.2.2/go.mod h1:dp3ihfy1AhCLKANDaPETmVWhqPkOmwvJtpK/biHfopE= 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 9afd341e..514bbe9c 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.10" - HelmRecommendedVersion = "v4.2.1" // Recommended Helm 4 version + HelmRecommendedVersion = "v4.2.2" // 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"