public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: update helm-diff to version 3.12.2 in CI and Dockerfiles (#2073) 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-06-11 21:18:31 +08:00 committed by GitHub
parent 1e3b20c4a7
commit 131e3f3f04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yaml vendored
View File

@ -67,7 +67,7 @@ jobs:
# we will mark this combination as failable, # we will mark this combination as failable,
# and instruct users to upgrade helm and helm-secrets at once. # and instruct users to upgrade helm and helm-secrets at once.
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.2
extra-helmfile-flags: '' extra-helmfile-flags: ''
- helm-version: v3.18.2 - helm-version: v3.18.2
kustomize-version: v5.2.1 kustomize-version: v5.2.1
@ -77,14 +77,14 @@ jobs:
- helm-version: v3.18.2 - helm-version: v3.18.2
kustomize-version: v5.4.3 kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.2
extra-helmfile-flags: '' extra-helmfile-flags: ''
# In case you need to test some optional helmfile features, # In case you need to test some optional helmfile features,
# enable it via extra-helmfile-flags below. # enable it via extra-helmfile-flags below.
- helm-version: v3.18.2 - helm-version: v3.18.2
kustomize-version: v5.4.3 kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.2
extra-helmfile-flags: '--enable-live-output' extra-helmfile-flags: '--enable-live-output'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

2
Dockerfile
View File

@ -93,7 +93,7 @@ RUN set -x && \
[ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \
[ "$(age-keygen --version)" = "${AGE_VERSION}" ] [ "$(age-keygen --version)" = "${AGE_VERSION}" ]
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.1 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.2 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.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 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \

2
Dockerfile.debian-stable-slim
View File

@ -99,7 +99,7 @@ RUN set -x && \
[ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \
[ "$(age-keygen --version)" = "${AGE_VERSION}" ] [ "$(age-keygen --version)" = "${AGE_VERSION}" ]
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.1 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.2 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.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 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \

2
Dockerfile.ubuntu
View File

@ -99,7 +99,7 @@ RUN set -x && \
[ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \
[ "$(age-keygen --version)" = "${AGE_VERSION}" ] [ "$(age-keygen --version)" = "${AGE_VERSION}" ]
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.1 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.12.2 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.5 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.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 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v1.3.0 && \

2
pkg/app/init.go
View File

@ -19,7 +19,7 @@ import (
const ( const (
HelmRequiredVersion = "v3.17.3" HelmRequiredVersion = "v3.17.3"
HelmRecommendedVersion = "v3.18.2" HelmRecommendedVersion = "v3.18.2"
HelmDiffRecommendedVersion = "v3.12.1" HelmDiffRecommendedVersion = "v3.12.2"
HelmSecretsRecommendedVersion = "v4.6.5" HelmSecretsRecommendedVersion = "v4.6.5"
HelmGitRecommendedVersion = "v1.3.0" HelmGitRecommendedVersion = "v1.3.0"
HelmS3RecommendedVersion = "v0.16.3" HelmS3RecommendedVersion = "v0.16.3"

2
test/integration/run.sh
View File

@ -27,7 +27,7 @@ export HELM_DATA_HOME="${helm_dir}/data"
export HELM_HOME="${HELM_DATA_HOME}" export HELM_HOME="${HELM_DATA_HOME}"
export HELM_PLUGINS="${HELM_DATA_HOME}/plugins" export HELM_PLUGINS="${HELM_DATA_HOME}/plugins"
export HELM_CONFIG_HOME="${helm_dir}/config" export HELM_CONFIG_HOME="${helm_dir}/config"
HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.12.1}" HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.12.2}"
HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}" HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}"
HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}" HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}"
export GNUPGHOME="${PWD}/${dir}/.gnupg" export GNUPGHOME="${PWD}/${dir}/.gnupg"