Bump helm and helmdiff (#77)

* Bump helm and helmdiff

* Bump actions versions

* Bump helm and helmdiff in docker container

* Install helmdiff

.github/actions/build-docker-images/action.yml

@@ -9,22 +9,22 @@ inputs:
     required: true
   git_tag:
     description: Git release tag
-    default: ''
+    default: ""
   git_rev:
     description: Git commit hash
-    default: ''
+    default: ""
 
 runs:
   using: composite
   steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3.5.0
+      uses: actions/checkout@v4
 
     - name: Configure DockerHub
       uses: ./.github/actions/configure-dockerhub
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
       with:
         platforms: linux/${{ inputs.arch }}
 

Dockerfile

@@ -53,6 +53,7 @@ RUN git clone -b $TFENV_VER --depth 1 https://github.com/tfutils/tfenv.git /tmp/
 
 ARG HELM_VERSION
 ENV HELM_VERSION=$HELM_VERSION
+
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/${HELM_VERSION}/scripts/get-helm-3 && \
   chmod 700 get_helm.sh && \
   ./get_helm.sh
@@ -131,3 +132,7 @@ ENV PATH="/opt/tfenv/bin:/opt/bin:${PATH}"
 
 COPY --from=downloader /usr/local/bin/helm /opt/bin/helm
 
+ARG HELM_DIFF_VERSION
+ENV HELM_DIFF_VERSION=$HELM_DIFF_VERSION
+
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}

Makefile

@@ -8,7 +8,8 @@ AWSCLI_VERSION=2.7.0
 TFEDIT_VERSION=0.0.3
 TFMIGRATE_VERSION=0.3.3
 TFENV_VER=v3.0.0
-HELM_VERSION=v3.12.1
+HELM_VERSION=v3.15.2
+HELM_DIFF_VERSION=v3.9.9
 
 STATIC_IMAGE_DUMMY=${call IMAGE_DUMMY,${STATIC_IMAGE}/${VERSION}}
 FQ_STATIC_IMAGE=$(call FQ_DOCKER_IMAGE,${STATIC_IMAGE})
@@ -46,6 +47,7 @@ build-%: Dockerfile  ${ANSIBLE_ROLES} ${ANSIBLE_PLUGINS} ${GRAFANA_DASHBOARDS} $
 		--build-arg TFMIGRATE_VER=${TFMIGRATE_VERSION} \
 		--build-arg TFENV_VER=${TFENV_VER} \
 		--build-arg HELM_VERSION=${HELM_VERSION} \
+		--build-arg HELM_DIFF_VERSION=${HELM_DIFF_VERSION} \
 		${LOADARG} \
 		-t ${STATIC_IMAGE}:${VERSION} \
 		.

ansible-roles/helm/defaults/main.yml

@@ -1,8 +1,8 @@
 ---
 # defaults file for helm
-helm_version: 3.7
+helm_version: 3.15
 
-helm_diff_plugin_version: v3.5.0
+helm_diff_plugin_version: v3.9.9
 
 helm_setup: no
 helm_upgrade: no

ansible-roles/helm/tasks/setup.yml

@@ -30,8 +30,7 @@
   kubernetes.core.helm_plugin:
     state: present
     plugin_path: https://github.com/databus23/helm-diff
-    # plugin_version not supported on current version of kubernetes.core
-    #plugin_version: "{{helm_diff_plugin_version}}"
+    plugin_version: "{{helm_diff_plugin_version}}"
   when:
     - not helm_setup