Helm installer fix for v3

Author: Anumita

Tasks/HelmInstallerV0/src/helmtoolinstaller.ts

@@ -32,10 +32,18 @@ async function configureHelm() {
 
 async function verifyHelm() {
     console.log(tl.loc("VerifyHelmInstallation"));
+    var helmVersion = await helminstaller.getHelmVersion();
     var helmToolPath = tl.which("helm", true);
     var helmTool = tl.tool(helmToolPath);
-    helmTool.arg("init");
-    helmTool.arg("--client-only");
+
+    // Check if using Helm 2 or Helm 3
+    if (helmVersion.startsWith("v2")) {
+        helmTool.arg("init");
+        helmTool.arg("--client-only");
+    } else {
+        helmTool.arg("version");
+    }
+
     return helmTool.exec()
 }
 

Tasks/HelmInstallerV0/task.json

@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 155,
-        "Patch": 1
+        "Minor": 159,
+        "Patch": 0
     },
     "demands": [],
     "satisfies": [

Tasks/HelmInstallerV0/task.loc.json

@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 155,
-    "Patch": 1
+    "Minor": 159,
+    "Patch": 0
   },
   "demands": [],
   "satisfies": [
@@ -93,4 +93,4 @@
     "HelmLatestNotKnown": "ms-resource:loc.messages.HelmLatestNotKnown",
     "VerifyHelmInstallation": "ms-resource:loc.messages.VerifyHelmInstallation"
   }
-}
+}

Tasks/HelmInstallerV1/src/helmtoolinstaller.ts

@@ -20,10 +20,18 @@ async function configureHelm() {
 
 async function verifyHelm() {
     console.log(tl.loc("VerifyHelmInstallation"));
+    var helmVersion = await utils.getHelmVersion();
     var helmToolPath = tl.which("helm", true);
     var helmTool = tl.tool(helmToolPath);
-    helmTool.arg("init");
-    helmTool.arg("--client-only");
+
+    // Check if using Helm 2 or Helm 3
+    if (helmVersion.startsWith("v2")) {
+        helmTool.arg("init");
+        helmTool.arg("--client-only");
+    } else {
+        helmTool.arg("version");
+    }
+
     return helmTool.exec()
 }
 

Tasks/HelmInstallerV1/task.json

@@ -14,7 +14,7 @@
     "version": {
         "Major": 1,
         "Minor": 159,
-        "Patch": 2
+        "Patch": 3
     },
     "preview": true,
     "demands": [],

Tasks/HelmInstallerV1/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 1,
     "Minor": 159,
-    "Patch": 2
+    "Patch": 3
   },
   "preview": true,
   "demands": [],
@@ -41,4 +41,4 @@
     "NotAValidSemverVersion": "ms-resource:loc.messages.NotAValidSemverVersion",
     "VerifyHelmInstallation": "ms-resource:loc.messages.VerifyHelmInstallation"
   }
-}
+}