From 7c0134fa661e4fc19f0372db2df4f5ffd4595204 Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Sun, 3 Mar 2024 09:45:57 +0800 Subject: [PATCH] bump helm-diff to 3.9.5 (#1384) Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 8 ++++---- Dockerfile | 2 +- Dockerfile.debian-stable-slim | 2 +- Dockerfile.ubuntu | 2 +- pkg/app/init.go | 2 +- test/integration/run.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c766ba068..811d148f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: # we will mark this combination as failable, # and instruct users to upgrade helm and helm-secrets at once. plugin-secrets-version: 4.5.1 - plugin-diff-version: 3.9.4 + plugin-diff-version: 3.9.5 extra-helmfile-flags: '' v1mode: '' - helm-version: v3.14.2 @@ -80,14 +80,14 @@ jobs: - helm-version: v3.14.2 kustomize-version: v5.2.1 plugin-secrets-version: 4.5.1 - plugin-diff-version: 3.9.4 + plugin-diff-version: 3.9.5 extra-helmfile-flags: '' v1mode: '' # Helmfile v1 - helm-version: v3.14.2 kustomize-version: v5.2.1 plugin-secrets-version: 4.5.1 - plugin-diff-version: 3.9.4 + plugin-diff-version: 3.9.5 extra-helmfile-flags: '' v1mode: 'true' # In case you need to test some optional helmfile features, @@ -95,7 +95,7 @@ jobs: - helm-version: v3.14.2 kustomize-version: v5.2.1 plugin-secrets-version: 4.5.1 - plugin-diff-version: 3.9.4 + plugin-diff-version: 3.9.5 extra-helmfile-flags: '--enable-live-output' v1mode: '' steps: diff --git a/Dockerfile b/Dockerfile index a9f64740e..d9a91f043 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.4 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.5.1 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.15.1 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.15.1 && \ diff --git a/Dockerfile.debian-stable-slim b/Dockerfile.debian-stable-slim index 8ad307c19..3a64d983b 100644 --- a/Dockerfile.debian-stable-slim +++ b/Dockerfile.debian-stable-slim @@ -99,7 +99,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.4 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.5.1 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.15.1 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.15.1 && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index e8e67f6fa..1287b0e54 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -99,7 +99,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.4 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.5.1 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.15.1 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.15.1 && \ diff --git a/pkg/app/init.go b/pkg/app/init.go index 2c5a6444c..43647688f 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -19,7 +19,7 @@ import ( const ( HelmRequiredVersion = "v3.13.3" HelmRecommendedVersion = "v3.14.2" - HelmDiffRecommendedVersion = "v3.9.4" + HelmDiffRecommendedVersion = "v3.9.5" HelmSecretsRecommendedVersion = "v4.1.1" HelmGitRecommendedVersion = "v0.12.0" HelmS3RecommendedVersion = "v0.14.0" diff --git a/test/integration/run.sh b/test/integration/run.sh index 4c16aeadc..893bd39c4 100755 --- a/test/integration/run.sh +++ b/test/integration/run.sh @@ -27,7 +27,7 @@ export HELM_DATA_HOME="${helm_dir}/data" export HELM_HOME="${HELM_DATA_HOME}" export HELM_PLUGINS="${HELM_DATA_HOME}/plugins" export HELM_CONFIG_HOME="${helm_dir}/config" -HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.4}" +HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.5}" HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}" export GNUPGHOME="${PWD}/${dir}/.gnupg" export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"