Skip to content

Commit

Permalink
Bump helm-diff to version 3.3.1 (helm#2041)
Browse files Browse the repository at this point in the history 
helm-diff 3.3.1 adds a new option `HELM_DIFF_THREE_WAY_MERGE=true` which enables the use of there-way merge for diff, which is expected to fix helm#2013
  • Loading branch information
@mumoshu
mumoshu committed Jan 10, 2022
1 parent fe8a176 commit 1735fb5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN set -x && \
rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
mv kustomize /usr/local/bin/kustomize

RUN helm plugin install https://github.com/databus23/helm-diff --version v3.1.3 && \
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.3.1 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debian
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN set -x && \
rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
mv kustomize /usr/local/bin/kustomize

RUN helm plugin install https://github.com/databus23/helm-diff --version v3.1.3 && \
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.3.1 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.helm3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN set -x && \
rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
mv kustomize /usr/local/bin/kustomize

RUN helm plugin install https://github.com/databus23/helm-diff --version v3.1.3 && \
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.3.1 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.helm3.ubuntu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN set -x && \

RUN pip install sops

RUN helm plugin install https://github.com/databus23/helm-diff --version v3.1.3 && \
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.3.1 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0
Expand Down
2 changes: 1 addition & 1 deletion test/integration/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export HELM_HOME="${HELM_DATA_HOME}"
export HELM_PLUGINS="${HELM_DATA_HOME}/plugins"
export HELM_CONFIG_HOME="${helm_dir}/config"
HELM_SECRETS_VERSION=3.5.0
HELM_DIFF_VERSION=3.1.3
HELM_DIFF_VERSION=3.3.1
export GNUPGHOME="${PWD}/${dir}/.gnupg"
export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"

Expand Down

0 comments on commit 1735fb5

Please sign in to comment.