Merge pull request #11773 from microsoft/users/ansheno/m159Helmfix3

Users/ansheno/m159 helmfix3
microsoft · Nov 14, 2019 · e25488f · e25488f
2 parents 57a57f6 + 117a4b8
commit e25488f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/Tasks/HelmInstallerV0/src/helmtoolinstaller.ts b/Tasks/HelmInstallerV0/src/helmtoolinstaller.ts
@@ -10,6 +10,8 @@ import * as helminstaller from "./helminstaller"
 
 tl.setResourcePath(path.join(__dirname, '..', 'task.json'));
 
+var helmVersion = ""
+
 async function configureKubectl() {
     var version = await kubectlinstaller.getKuberctlVersion();
     var kubectlPath = await kubectlinstaller.downloadKubectl(version);
@@ -21,8 +23,8 @@ async function configureKubectl() {
 }
 
 async function configureHelm() {
-    var version = await helminstaller.getHelmVersion();
-    var helmPath = await helminstaller.downloadHelm(version);
+    helmVersion = await helminstaller.getHelmVersion();
+    var helmPath = await helminstaller.downloadHelm(helmVersion);
 
     // prepend the tools path. instructs the agent to prepend for future tasks
     if (!process.env['PATH'].startsWith(path.dirname(helmPath))) {
@@ -33,10 +35,14 @@ async function configureHelm() {
 async function verifyHelm() {
     console.log(tl.loc("VerifyHelmInstallation"));
     var helmToolPath = tl.which("helm", true);
-    var helmTool = tl.tool(helmToolPath);
-    helmTool.arg("init");
-    helmTool.arg("--client-only");
-    return helmTool.exec()
+
+    // Check if using Helm 2 or Helm 3
+    if (helmVersion.startsWith("v2")) {
+        var helmTool = tl.tool(helmToolPath);
+        helmTool.arg("init");
+        helmTool.arg("--client-only");
+        return helmTool.exec()
+    }
 }
 
 configureHelm()

diff --git a/Tasks/HelmInstallerV0/task.json b/Tasks/HelmInstallerV0/task.json
@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 155,
-        "Patch": 1
+        "Minor": 159,
+        "Patch": 0
     },
     "demands": [],
     "satisfies": [

diff --git a/Tasks/HelmInstallerV0/task.loc.json b/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"
   }
-}
+}
diff --git a/Tasks/HelmInstallerV1/src/helmtoolinstaller.ts b/Tasks/HelmInstallerV1/src/helmtoolinstaller.ts
@@ -7,9 +7,10 @@ import utils = require("./utils");
 
 tl.setResourcePath(path.join(__dirname, '..', 'task.json'));
 
+var version = ""
 
 async function configureHelm() {
-    var version = await utils.getHelmVersion();
+    version = await utils.getHelmVersion();
     var helmPath = await utils.downloadHelm(version);
 
     // prepend the tools path. instructs the agent to prepend for future tasks
@@ -21,10 +22,14 @@ async function configureHelm() {
 async function verifyHelm() {
     console.log(tl.loc("VerifyHelmInstallation"));
     var helmToolPath = tl.which("helm", true);
-    var helmTool = tl.tool(helmToolPath);
-    helmTool.arg("init");
-    helmTool.arg("--client-only");
-    return helmTool.exec()
+
+    // Check if using Helm 2 or Helm 3
+    if (version.startsWith("v2")) {
+        var helmTool = tl.tool(helmToolPath);
+        helmTool.arg("init");
+        helmTool.arg("--client-only");
+        return helmTool.exec()
+    }
 }
 
 configureHelm()

diff --git a/Tasks/HelmInstallerV1/task.json b/Tasks/HelmInstallerV1/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 1,
         "Minor": 159,
-        "Patch": 2
+        "Patch": 3
     },
     "preview": true,
     "demands": [],

diff --git a/Tasks/HelmInstallerV1/task.loc.json b/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"
   }
-}
+}