2142647 Update AKS API used to get cluster credentials in AKS tasks (#…

…20649) * 2142647 Update AKS API used to get cluster credentials in AKS tasks * Package-lock.json updated * 2142647 moved the common code to common liberary and added help URL for 403 error * 2142647 fixed registry issues * 2142647 fixed issue * 2142647 Update AKS API used to get cluster credentials in AKS tasks * fixed pipeline Failure
microsoft · Dec 10, 2024 · 75ecf01 · 75ecf01
1 parent f9c922c
commit 75ecf01
Show file tree

Hide file tree

Showing 110 changed files with 1,609 additions and 1,823 deletions.
diff --git a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json
@@ -21,7 +21,7 @@
     "@types/uuid": "^9.0.0",
     "azure-pipelines-task-lib": "^4.11.0",
     "agent-base": "^6.0.2",
-    "azure-pipelines-tasks-azure-arm-rest": "3.246.5",
+    "azure-pipelines-tasks-azure-arm-rest": "3.250.0",
     "azure-pipelines-tasks-docker-common": "^2.242.0",
     "azure-pipelines-tasks-kubernetes-common": "^2.235.0",
     "azure-pipelines-tool-lib": "^2.0.7",

diff --git a/Tasks/AzureFunctionOnKubernetesV1/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/package-lock.json
diff --git a/Tasks/AzureFunctionOnKubernetesV1/package.json b/Tasks/AzureFunctionOnKubernetesV1/package.json
@@ -21,7 +21,7 @@
     "@types/uuid": "^9.0.0",
     "azure-pipelines-task-lib": "^4.11.0",
     "agent-base": "^6.0.2",
-    "azure-pipelines-tasks-azure-arm-rest": "3.246.5",
+    "azure-pipelines-tasks-azure-arm-rest": "3.250.0",
     "azure-pipelines-tasks-docker-common": "^2.242.0",
     "azure-pipelines-tasks-kubernetes-common": "^2.235.0",
     "azure-pipelines-tool-lib": "^2.0.7",

diff --git a/Tasks/AzureFunctionOnKubernetesV1/src/clusterconnection.ts b/Tasks/AzureFunctionOnKubernetesV1/src/clusterconnection.ts
@@ -23,7 +23,7 @@ export default class ClusterConnection {
 
     private loadClusterType(connectionType: string): any {
         if(connectionType === "Azure Resource Manager") {
-            return require("./clusters/armkubernetescluster");
+            return require("azure-pipelines-tasks-azure-arm-rest/aksUtility")
         }
         else {
             return require("./clusters/generickubernetescluster");
@@ -32,9 +32,15 @@ export default class ClusterConnection {
 
     // get kubeconfig file path
     private async getKubeConfig(connectionType): Promise<string> {
-        return this.loadClusterType(connectionType).getKubeConfig().then((config) => {
-            return config;
-        });
+        if (connectionType === "Azure Resource Manager") {
+            const clusterName : string = tl.getInput("kubernetesCluster", true);
+            const azureSubscriptionEndpoint : string = tl.getInput("azureSubscriptionEndpoint", true);
+            const resourceGroup : string = tl.getInput("azureResourceGroup", true);
+            const useClusterAdmin: boolean = tl.getBoolInput('useClusterAdmin');
+            return this.loadClusterType(connectionType).getKubeConfig(azureSubscriptionEndpoint, resourceGroup, clusterName, useClusterAdmin)
+        } else {
+            return this.loadClusterType(connectionType).getKubeConfig()
+        }
     }
 
     private async initialize(): Promise<void> {

diff --git a/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts b/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts
diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.json b/Tasks/AzureFunctionOnKubernetesV1/task.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 247,
-    "Patch": 2
+    "Minor": 250,
+    "Patch": 0
   },
   "demands": [],
   "groups": [

diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.loc.json b/Tasks/AzureFunctionOnKubernetesV1/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 247,
-    "Patch": 2
+    "Minor": 250,
+    "Patch": 0
   },
   "demands": [],
   "groups": [

diff --git a/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json b/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json b/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json
@@ -6,7 +6,7 @@
     "@types/uuid": "^8.3.0",
     "agent-base": "6.0.2",
     "azure-pipelines-task-lib": "^4.13.0",
-    "azure-pipelines-tasks-azure-arm-rest": "3.246.5",
+    "azure-pipelines-tasks-azure-arm-rest": "3.250.0",
     "azure-pipelines-tasks-docker-common": "^2.242.0",
     "azure-pipelines-tasks-kubernetes-common": "^2.224.1",
     "azure-pipelines-tasks-securefiles-common": "^2.207.0",

diff --git a/Tasks/HelmDeployV0/package-lock.json b/Tasks/HelmDeployV0/package-lock.json
diff --git a/Tasks/HelmDeployV0/package.json b/Tasks/HelmDeployV0/package.json
@@ -6,7 +6,7 @@
     "@types/uuid": "^8.3.0",
     "agent-base": "6.0.2",
     "azure-pipelines-task-lib": "^4.13.0",
-    "azure-pipelines-tasks-azure-arm-rest": "3.246.5",
+    "azure-pipelines-tasks-azure-arm-rest": "3.250.0",
     "azure-pipelines-tasks-docker-common": "^2.242.0",
     "azure-pipelines-tasks-kubernetes-common": "^2.224.1",
     "azure-pipelines-tasks-securefiles-common": "^2.207.0",

diff --git a/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts b/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts
diff --git a/Tasks/HelmDeployV0/src/helm.ts b/Tasks/HelmDeployV0/src/helm.ts
@@ -33,7 +33,7 @@ function getClusterType(): any {
     var connectionType = tl.getInput("connectionType", true);
     var endpoint = tl.getInput("azureSubscriptionEndpoint")
     if (connectionType === "Azure Resource Manager" && endpoint) {
-        return require("./clusters/armkubernetescluster")
+        return require("azure-pipelines-tasks-azure-arm-rest/aksUtility")
     }
 
     return require("./clusters/generickubernetescluster")
@@ -51,13 +51,22 @@ function isKubConfigLogoutRequired(command: string): boolean {
 
 // get kubeconfig file path
 async function getKubeConfigFile(): Promise<string> {
-    return getClusterType().getKubeConfig().then((config) => {
-        var configFilePath = getKubeConfigFilePath();
-        tl.debug(tl.loc("KubeConfigFilePath", configFilePath));
-        fs.writeFileSync(configFilePath, config);
-        fs.chmodSync(configFilePath, '600');
-        return configFilePath;
-    });
+    const connectionType = tl.getInput("connectionType", true)
+    let result
+    if (connectionType === "Azure Resource Manager") {
+        const clusterName : string = tl.getInput("kubernetesCluster", true);
+        const azureSubscriptionEndpoint : string = tl.getInput("azureSubscriptionEndpoint", true);
+        const resourceGroup : string = tl.getInput("azureResourceGroup", true);
+        const useClusterAdmin: boolean = tl.getBoolInput('useClusterAdmin');
+        result = await getClusterType().getKubeConfig(azureSubscriptionEndpoint, resourceGroup, clusterName, useClusterAdmin)
+    } else {
+        result = await getClusterType().getKubeConfig()
+    }
+    let configFilePath = getKubeConfigFilePath();
+    tl.debug(tl.loc("KubeConfigFilePath", configFilePath));
+    fs.writeFileSync(configFilePath, result);
+    fs.chmodSync(configFilePath, '600');
+    return configFilePath;
 }
 
 async function runHelmSaveCommand(helmCli: helmcli, kubectlCli: kubernetescli, failOnStderr: boolean): Promise<void> {

diff --git a/Tasks/HelmDeployV0/task.json b/Tasks/HelmDeployV0/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 247,
-    "Patch": 2
+    "Minor": 250,
+    "Patch": 0
   },
   "demands": [],
   "groups": [

diff --git a/Tasks/HelmDeployV0/task.loc.json b/Tasks/HelmDeployV0/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 247,
-    "Patch": 2
+    "Minor": 250,
+    "Patch": 0
   },
   "demands": [],
   "groups": [

diff --git a/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json b/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json b/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json
@@ -6,7 +6,7 @@
     "@types/uuid": "^8.3.0",
     "agent-base": "6.0.2",
     "azure-pipelines-task-lib": "^4.13.0",
-    "azure-pipelines-tasks-azure-arm-rest": "3.246.5",
+    "azure-pipelines-tasks-azure-arm-rest": "3.250.0",
     "azure-pipelines-tasks-docker-common": "^2.242.0",
     "azure-pipelines-tasks-kubernetes-common": "^2.224.1",
     "azure-pipelines-tasks-securefiles-common": "^2.207.0",