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

bump helm-diff to 3.9.7 (#1536) 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2024-05-27 08:48:56 +08:00 committed by GitHub
parent 2155242b76
commit 2f408163cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,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.0 plugin-secrets-version: 4.6.0
plugin-diff-version: 3.9.6 plugin-diff-version: 3.9.7
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: '' v1mode: ''
- helm-version: v3.15.1 - helm-version: v3.15.1
@ -80,14 +80,14 @@ jobs:
- helm-version: v3.15.1 - helm-version: v3.15.1
kustomize-version: v5.2.1 kustomize-version: v5.2.1
plugin-secrets-version: 4.6.0 plugin-secrets-version: 4.6.0
plugin-diff-version: 3.9.6 plugin-diff-version: 3.9.7
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: '' v1mode: ''
# Helmfile v1 # Helmfile v1
- helm-version: v3.15.1 - helm-version: v3.15.1
kustomize-version: v5.2.1 kustomize-version: v5.2.1
plugin-secrets-version: 4.6.0 plugin-secrets-version: 4.6.0
plugin-diff-version: 3.9.6 plugin-diff-version: 3.9.7
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: 'true' v1mode: 'true'
# In case you need to test some optional helmfile features, # In case you need to test some optional helmfile features,
@ -95,7 +95,7 @@ jobs:
- helm-version: v3.15.1 - helm-version: v3.15.1
kustomize-version: v5.2.1 kustomize-version: v5.2.1
plugin-secrets-version: 4.6.0 plugin-secrets-version: 4.6.0
plugin-diff-version: 3.9.6 plugin-diff-version: 3.9.7
extra-helmfile-flags: '--enable-live-output' extra-helmfile-flags: '--enable-live-output'
v1mode: '' v1mode: ''
steps: steps:

2
Dockerfile
View File

@ -94,7 +94,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.9.6 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.7 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ 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.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.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.9.6 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.7 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ 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.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.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.9.6 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.7 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ 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.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \

2
pkg/app/init.go
View File

@ -19,7 +19,7 @@ import (
const ( const (
HelmRequiredVersion = "v3.14.4" HelmRequiredVersion = "v3.14.4"
HelmRecommendedVersion = "v3.15.1" HelmRecommendedVersion = "v3.15.1"
HelmDiffRecommendedVersion = "v3.9.6" HelmDiffRecommendedVersion = "v3.9.7"
HelmSecretsRecommendedVersion = "v4.6.0" HelmSecretsRecommendedVersion = "v4.6.0"
HelmGitRecommendedVersion = "v0.15.1" HelmGitRecommendedVersion = "v0.15.1"
HelmS3RecommendedVersion = "v0.16.0" HelmS3RecommendedVersion = "v0.16.0"

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.9.6}" HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.7}"
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"
export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700" export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"