Merge "Fixup sulfur/jdk17 verify jobs"

[releng/builder.git] / packer / provision / helm.yaml

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 7b01c22037d0fb2eebb099afa96170294a2c4007..f5a6cfa370b023cbe593efbe5885589a75a7b521 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,10 +6,11 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.15.11
+    kubectl_version: 1.22.4
     helm_version: 2.16.6
     helm3_3_version: 3.3.4
     helm3_5_version: 3.5.1
+    helm3_7_version: 3.7.1
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -24,7 +25,7 @@
       block:
         - name: "Fetch tar.gz for {{helm_version}}"
           get_url:
-            url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz"
+            url: "https://get.helm.sh/helm-v{{helm_version}}-linux-amd64.tar.gz"
             dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
         - name: "Unarchive {{helm_version}}"
           unarchive:
@@ -62,15 +63,6 @@
         - name: "Check kubectl {{kubectl_version}}"
           command: "which kubectl"
 
-        - name: "Install Helm 3.3"
-          shell: |
-            echo "----> Installing helm 3.3"
-            wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
-            tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
-            mv linux-amd64/helm /usr/local/bin/helm3.3
-            which helm3.3
-          become: true
-
     - name: "Install Helm3.5 {{helm3_5_version}}"
       block:
         - name: "Create directory /tmp/helm3.5"
@@ -95,14 +87,29 @@
         - name: "Check kubectl {{kubectl_version}}"
           command: "which kubectl"
 
-        - name: "Install Helm 3.5"
-          shell: |
-            echo "----> Installing helm3.5"
-            wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-            tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-            mv linux-amd64/helm /usr/local/bin/helm3.5
-            which helm3.5
-          become: true
+    - name: "Install Helm3.7 {{helm3_7_version}}"
+      block:
+        - name: "Create directory /tmp/helm3.7"
+          file:
+            path: /tmp/helm3.7
+            state: directory
+        - name: "Fetch tar.gz for Helm 3.7"
+          get_url:
+            url: "https://get.helm.sh/helm-v{{helm3_7_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.7
+        - name: "Unarchive Helm 3.7"
+          unarchive:
+            src: "/tmp/helm3.7/helm-v{{helm3_7_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.7
+            remote_src: true
+          become: yes
+        - name: "Move Helm 3.7 bin to /usr/local/bin and set as executable"
+          command: "mv /tmp/helm3.7/linux-amd64/helm /usr/local/bin/helm3.7"
+          become: yes
+        - name: "Check Helm 3.7"
+          command: "which helm3.7"
+        - name: "Check kubectl {{kubectl_version}}"
+          command: "which kubectl"
 
     - name: "Install ChartMuseum {{chartmuseum_version}}"
       block: