Merge "chore: set helm project wide to 3.18.1"

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

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

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

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 }}"

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"
 ...

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 }}"

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

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