From 1735fb5bed624e318a38e402bb35a49234097980 Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Mon, 10 Jan 2022 16:21:14 +0900
Subject: [PATCH] Bump helm-diff to version 3.3.1 (#2041)

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 #2013
---
 Dockerfile              | 2 +-
 Dockerfile.debian       | 2 +-
 Dockerfile.helm3        | 2 +-
 Dockerfile.helm3.ubuntu | 2 +-
 test/integration/run.sh | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a3e9ee7..ed94c036 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 90e1e03b..4d8f91ec 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -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
diff --git a/Dockerfile.helm3 b/Dockerfile.helm3
index 1ae12f4c..f51ca85d 100644
--- a/Dockerfile.helm3
+++ b/Dockerfile.helm3
@@ -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
diff --git a/Dockerfile.helm3.ubuntu b/Dockerfile.helm3.ubuntu
index ae46fd4f..a883c6f9 100644
--- a/Dockerfile.helm3.ubuntu
+++ b/Dockerfile.helm3.ubuntu
@@ -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
diff --git a/test/integration/run.sh b/test/integration/run.sh
index f30c7962..e4d4096b 100755
--- a/test/integration/run.sh
+++ b/test/integration/run.sh
@@ -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"