From 37b71c746c50d4335c57e4a1b8230c737a40b323 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Fri, 12 Dec 2025 17:56:14 -0600
Subject: [PATCH] chore: set helm project wide to 3.18.1

This makes it so that 3.18.1 is the version used consistently and sets
it at the top-level.

Change-Id: I8623ed5b040ec53dd576471602cc93f091b581f3
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 playbooks/build-chart.yaml             | 3 +--
 playbooks/lint.yaml                    | 3 +--
 roles/deploy-env/defaults/main.yaml    | 2 +-
 roles/deploy-env/tasks/k8s_client.yaml | 9 ++-------
 roles/osh-bandit/defaults/main.yaml    | 2 +-
 roles/osh-bandit/tasks/main.yaml       | 8 ++++----
 zuul.d/base.yaml                       | 2 --
 zuul.d/project.yaml                    | 4 ++++
 8 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/playbooks/build-chart.yaml b/playbooks/build-chart.yaml
index 02fd205d56..3af1c208b0 100644
--- a/playbooks/build-chart.yaml
+++ b/playbooks/build-chart.yaml
@@ -15,8 +15,7 @@
   roles:
     - ensure-python
     - ensure-pip
-    - name: ensure-helm
-      helm_version: "3.16.4"
+    - ensure-helm
 
   tasks:
     - name: Install reno
diff --git a/playbooks/lint.yaml b/playbooks/lint.yaml
index bc487c6552..8f9d556c1b 100644
--- a/playbooks/lint.yaml
+++ b/playbooks/lint.yaml
@@ -17,8 +17,7 @@
   roles:
     - ensure-python
     - ensure-pip
-    - name: ensure-helm
-      helm_version: "3.16.4"
+    - ensure-helm
     - name: ensure-chart-testing
       chart_testing_version: "3.11.0"
     - name: chart-testing
diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml
index 506745065b..a9f81342ee 100644
--- a/roles/deploy-env/defaults/main.yaml
+++ b/roles/deploy-env/defaults/main.yaml
@@ -14,7 +14,7 @@ kube_version_repo: "v1.32"
 # the list of k8s package versions are available here
 # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
 kube_version: "1.32.5-1.1"
-helm_version: "v3.18.1"
+helm_version: "3.18.1"
 crictl_version: "v1.33.0"
 
 calico_setup: true
diff --git a/roles/deploy-env/tasks/k8s_client.yaml b/roles/deploy-env/tasks/k8s_client.yaml
index d352223e8b..0385b4172e 100644
--- a/roles/deploy-env/tasks/k8s_client.yaml
+++ b/roles/deploy-env/tasks/k8s_client.yaml
@@ -45,13 +45,8 @@
 - name: Deploy Helm
   block:
     - name: Install Helm
-      shell: |
-        TMP_DIR=$(mktemp -d)
-        curl -sSL https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
-        mv "${TMP_DIR}"/helm /usr/local/bin/helm
-        rm -rf "${TMP_DIR}"
-      args:
-        executable: /bin/bash
+      include_role:
+        name: ensure-helm
 
     - name: Install osh helm plugin
       become_user: "{{ kubectl.user }}"
diff --git a/roles/osh-bandit/defaults/main.yaml b/roles/osh-bandit/defaults/main.yaml
index 3d68528453..ee5a8365cf 100644
--- a/roles/osh-bandit/defaults/main.yaml
+++ b/roles/osh-bandit/defaults/main.yaml
@@ -12,6 +12,6 @@
 
 ---
 work_dir: "{{ zuul.project.src_dir }}"
-helm_version: "v3.6.3"
+helm_version: "3.18.1"
 bandit_version: "1.7.1"
 ...
diff --git a/roles/osh-bandit/tasks/main.yaml b/roles/osh-bandit/tasks/main.yaml
index 961024b060..ad4e59aff1 100644
--- a/roles/osh-bandit/tasks/main.yaml
+++ b/roles/osh-bandit/tasks/main.yaml
@@ -12,11 +12,11 @@
 
 ---
 - name: Install Helm
+  include_role:
+    name: ensure-helm
+
+- name: Install yq bandit
   shell: |
-    TMP_DIR=$(mktemp -d)
-    curl -sSL https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
-    mv "${TMP_DIR}"/helm /usr/local/bin/helm
-    rm -rf "${TMP_DIR}"
     sudo -H pip3 install --upgrade yq bandit=={{ bandit_version }} setuptools
   args:
     chdir: "{{ work_dir }}"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index dbccff0aad..211ae16e3f 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -42,7 +42,6 @@
     post-run: playbooks/collect-logs.yaml
     run: playbooks/osh-bandit.yaml
     vars:
-      helm_version: "v3.6.3"
       bandit_version: "1.7.1"
 
 - job:
@@ -111,7 +110,6 @@
       metallb_version: "0.14.9"
       coredns_resolver_setup: false
       ingress_setup: true
-      helm_version: "v3.18.1"
       crictl_version: "v1.33.0"
       run_helm_tests: "no"
       openstack_provider_gateway_setup: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 87e6aa703a..df7b19173e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,6 +14,10 @@
 # limitations under the License.
 
 - project:
+    vars:
+      # shared across all jobs
+      helm_version: "3.18.1"
+
     templates:
       - publish-openstack-docs-pti
       - release-notes-jobs-python3