From 96d716ae00a0fcaf2740139a0154450c4a2d7b3f Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Mon, 18 Nov 2024 06:34:10 +0800 Subject: [PATCH] fix: update helm-diff to version 3.9.12 in CI and Dockerfiles (#1792) Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 8 ++++---- Dockerfile | 2 +- Dockerfile.debian-stable-slim | 2 +- Dockerfile.ubuntu | 2 +- pkg/app/init.go | 4 ++-- test/integration/run.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8807e776..221ccf32 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.6.0 - plugin-diff-version: 3.9.11 + plugin-diff-version: 3.9.12 extra-helmfile-flags: '' v1mode: '' - helm-version: v3.16.2 @@ -80,14 +80,14 @@ jobs: - helm-version: v3.16.2 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.11 + plugin-diff-version: 3.9.12 extra-helmfile-flags: '' v1mode: '' # Helmfile v1 - helm-version: v3.16.2 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.11 + plugin-diff-version: 3.9.12 extra-helmfile-flags: '' v1mode: 'true' # In case you need to test some optional helmfile features, @@ -95,7 +95,7 @@ jobs: - helm-version: v3.16.2 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.11 + plugin-diff-version: 3.9.12 extra-helmfile-flags: '--enable-live-output' v1mode: '' steps: diff --git a/Dockerfile b/Dockerfile index 20c4812d..823b4fbe 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.11 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.12 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/Dockerfile.debian-stable-slim b/Dockerfile.debian-stable-slim index 2ecff646..b70aa769 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.11 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.12 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 7dfc6a66..df02c01e 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.11 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.12 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/pkg/app/init.go b/pkg/app/init.go index efbdf030..47d4f16f 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -18,8 +18,8 @@ import ( const ( HelmRequiredVersion = "v3.15.4" - HelmRecommendedVersion = "v3.16.2" - HelmDiffRecommendedVersion = "v3.9.11" + HelmRecommendedVersion = "v3.16.3" + HelmDiffRecommendedVersion = "v3.9.12" HelmSecretsRecommendedVersion = "v4.6.0" HelmGitRecommendedVersion = "v0.15.1" HelmS3RecommendedVersion = "v0.16.0" diff --git a/test/integration/run.sh b/test/integration/run.sh index faedd4b4..e4248cc8 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.11}" +HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.12}" HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}" export GNUPGHOME="${PWD}/${dir}/.gnupg" export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"