chore: bump helm and helm-diff versions (#733)

Praqma · Nov 23, 2022 · d26c3e3 · d26c3e3
1 parent c319d15
commit d26c3e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ jobs:
       - run:
           name: build docker images and push them to dockerhub
           command: |
-            helm_versions=( "v3.7.2" "v3.8.2" "v3.9.4" "v3.10.1" )
+            helm_versions=( "v3.7.2" "v3.8.2" "v3.9.4" "v3.10.2" )
 
             TAG=$(git describe --abbrev=0 --tags)
             docker login -u $DOCKER_USER -p $DOCKER_PASS

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 ARG GO_VERSION="1.18.5"
 ARG ALPINE_VERSION="3.15"
 ARG GLOBAL_KUBE_VERSION="v1.23.6"
-ARG GLOBAL_HELM_VERSION="v3.9.4"
-ARG GLOBAL_HELM_DIFF_VERSION="v3.5.0"
+ARG GLOBAL_HELM_VERSION="v3.10.2"
+ARG GLOBAL_HELM_DIFF_VERSION="v3.6.0"
 ARG GLOBAL_HELM_GCS_VERSION="0.3.21"
 ARG GLOBAL_HELM_S3_VERSION="v0.10.0"
 ARG GLOBAL_HELM_SECRETS_VERSION="v3.13.0"
@@ -24,6 +24,7 @@ ENV HELM_GCS_VERSION=$GLOBAL_HELM_GCS_VERSION
 ENV HELM_S3_VERSION=$GLOBAL_HELM_S3_VERSION
 ENV HELM_SECRETS_VERSION=$GLOBAL_HELM_SECRETS_VERSION
 ENV SOPS_VERSION=$GLOBAL_SOPS_VERSION
+ENV HELM_DIFF_THREE_WAY_MERGE=true
 
 RUN apk add --update --no-cache ca-certificates git openssh openssl ruby curl wget tar gzip make bash