diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5621f6e6..1e4ea479 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,7 +57,7 @@ jobs: - helm-version: v3.16.4 kustomize-version: v5.2.1 plugin-secrets-version: 3.15.0 - plugin-diff-version: 3.8.1 + plugin-diff-version: 3.10.0 extra-helmfile-flags: '' - helm-version: v3.16.4 kustomize-version: v5.4.3 @@ -66,25 +66,25 @@ jobs: # Once it turned out to be not practically true, # 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.14 + plugin-secrets-version: 4.6.3 + plugin-diff-version: 3.11.0 extra-helmfile-flags: '' - helm-version: v3.17.2 kustomize-version: v5.2.1 plugin-secrets-version: 3.15.0 - plugin-diff-version: 3.8.1 + plugin-diff-version: 3.10.0 extra-helmfile-flags: '' - helm-version: v3.17.2 kustomize-version: v5.4.3 - plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.14 + plugin-secrets-version: 4.6.3 + plugin-diff-version: 3.11.0 extra-helmfile-flags: '' # In case you need to test some optional helmfile features, # enable it via extra-helmfile-flags below. - helm-version: v3.17.2 kustomize-version: v5.4.3 - plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.14 + plugin-secrets-version: 4.6.3 + plugin-diff-version: 3.11.0 extra-helmfile-flags: '--enable-live-output' steps: - uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index be857257..26a92e05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,10 +93,10 @@ 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.14 && \ - 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 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.11.0 && \ + helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.3 && \ + helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.3 && \ + helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \ rm -rf ${HELM_CACHE_HOME}/plugins # Allow users other than root to use helm plugins located in root home diff --git a/Dockerfile.debian-stable-slim b/Dockerfile.debian-stable-slim index 163ccb7f..5aa5dd00 100644 --- a/Dockerfile.debian-stable-slim +++ b/Dockerfile.debian-stable-slim @@ -99,10 +99,10 @@ 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.14 && \ - 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 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.11.0 && \ + helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.3 && \ + helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.3 && \ + helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \ rm -rf ${HELM_CACHE_HOME}/plugins # Allow users other than root to use helm plugins located in root home diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 228efe18..438a74df 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -99,10 +99,10 @@ 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.14 && \ - 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 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.11.0 && \ + helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.3 && \ + helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.3 && \ + helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \ rm -rf ${HELM_CACHE_HOME}/plugins # Allow users other than root to use helm plugins located in root home diff --git a/pkg/app/init.go b/pkg/app/init.go index 76243674..b0112286 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -19,10 +19,10 @@ import ( const ( HelmRequiredVersion = "v3.16.4" HelmRecommendedVersion = "v3.17.2" - HelmDiffRecommendedVersion = "v3.9.14" - HelmSecretsRecommendedVersion = "v4.6.0" - HelmGitRecommendedVersion = "v0.15.1" - HelmS3RecommendedVersion = "v0.16.0" + HelmDiffRecommendedVersion = "v3.11.0" + HelmSecretsRecommendedVersion = "v4.6.3" + HelmGitRecommendedVersion = "v1.3.0" + HelmS3RecommendedVersion = "v0.16.3" HelmInstallCommand = "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" ) diff --git a/test/integration/run.sh b/test/integration/run.sh index f43909ae..a2bc2708 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.14}" +HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.11.0}" HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}" HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}" export GNUPGHOME="${PWD}/${dir}/.gnupg"