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 cac1ffaeec8901e36fc165c58fb5dc7fa8de4870..f5a6cfa370b023cbe593efbe5885589a75a7b521 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,7 +6,7 @@
   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
@@ -63,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 +86,6 @@
           command: "which helm3.5"
         - 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:
@@ -127,14 +110,6 @@
           command: "which helm3.7"
         - name: "Check kubectl {{kubectl_version}}"
           command: "which kubectl"
-        - name: "Install Helm 3.7"
-          shell: |
-            echo "----> Installing helm3.7"
-            wget 'https://get.helm.sh/helm-v{{helm3_7_version}}-linux-amd64.tar.gz'
-            tar -xvf 'https://get.helm.sh/helm-v{{helm3_7_version}}-linux-amd64.tar.gz'
-            mv linux-amd64/helm /usr/local/bin/helm3.7
-            which helm3.7
-          become: true
 
     - name: "Install ChartMuseum {{chartmuseum_version}}"
       block: