Skip to content

Commit 75ecf01

Browse files
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
1 parent f9c922c commit 75ecf01

File tree

110 files changed

+1609
-1823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1609
-1823
lines changed

Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/uuid": "^9.0.0",
2222
"azure-pipelines-task-lib": "^4.11.0",
2323
"agent-base": "^6.0.2",
24-
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
24+
"azure-pipelines-tasks-azure-arm-rest": "3.250.0",
2525
"azure-pipelines-tasks-docker-common": "^2.242.0",
2626
"azure-pipelines-tasks-kubernetes-common": "^2.235.0",
2727
"azure-pipelines-tool-lib": "^2.0.7",

Tasks/AzureFunctionOnKubernetesV1/package-lock.json

+198-191
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureFunctionOnKubernetesV1/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/uuid": "^9.0.0",
2222
"azure-pipelines-task-lib": "^4.11.0",
2323
"agent-base": "^6.0.2",
24-
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
24+
"azure-pipelines-tasks-azure-arm-rest": "3.250.0",
2525
"azure-pipelines-tasks-docker-common": "^2.242.0",
2626
"azure-pipelines-tasks-kubernetes-common": "^2.235.0",
2727
"azure-pipelines-tool-lib": "^2.0.7",

Tasks/AzureFunctionOnKubernetesV1/src/clusterconnection.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default class ClusterConnection {
2323

2424
private loadClusterType(connectionType: string): any {
2525
if(connectionType === "Azure Resource Manager") {
26-
return require("./clusters/armkubernetescluster");
26+
return require("azure-pipelines-tasks-azure-arm-rest/aksUtility")
2727
}
2828
else {
2929
return require("./clusters/generickubernetescluster");
@@ -32,9 +32,15 @@ export default class ClusterConnection {
3232

3333
// get kubeconfig file path
3434
private async getKubeConfig(connectionType): Promise<string> {
35-
return this.loadClusterType(connectionType).getKubeConfig().then((config) => {
36-
return config;
37-
});
35+
if (connectionType === "Azure Resource Manager") {
36+
const clusterName : string = tl.getInput("kubernetesCluster", true);
37+
const azureSubscriptionEndpoint : string = tl.getInput("azureSubscriptionEndpoint", true);
38+
const resourceGroup : string = tl.getInput("azureResourceGroup", true);
39+
const useClusterAdmin: boolean = tl.getBoolInput('useClusterAdmin');
40+
return this.loadClusterType(connectionType).getKubeConfig(azureSubscriptionEndpoint, resourceGroup, clusterName, useClusterAdmin)
41+
} else {
42+
return this.loadClusterType(connectionType).getKubeConfig()
43+
}
3844
}
3945

4046
private async initialize(): Promise<void> {

Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts

-26
This file was deleted.

Tasks/AzureFunctionOnKubernetesV1/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 1,
17-
"Minor": 247,
18-
"Patch": 2
17+
"Minor": 250,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"groups": [

Tasks/AzureFunctionOnKubernetesV1/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 1,
17-
"Minor": 247,
18-
"Patch": 2
17+
"Minor": 250,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"groups": [

Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/HelmDeployV0/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@types/uuid": "^8.3.0",
77
"agent-base": "6.0.2",
88
"azure-pipelines-task-lib": "^4.13.0",
9-
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
9+
"azure-pipelines-tasks-azure-arm-rest": "3.250.0",
1010
"azure-pipelines-tasks-docker-common": "^2.242.0",
1111
"azure-pipelines-tasks-kubernetes-common": "^2.224.1",
1212
"azure-pipelines-tasks-securefiles-common": "^2.207.0",

Tasks/HelmDeployV0/package-lock.json

+24-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/HelmDeployV0/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@types/uuid": "^8.3.0",
77
"agent-base": "6.0.2",
88
"azure-pipelines-task-lib": "^4.13.0",
9-
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
9+
"azure-pipelines-tasks-azure-arm-rest": "3.250.0",
1010
"azure-pipelines-tasks-docker-common": "^2.242.0",
1111
"azure-pipelines-tasks-kubernetes-common": "^2.224.1",
1212
"azure-pipelines-tasks-securefiles-common": "^2.207.0",

Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts

-26
This file was deleted.

Tasks/HelmDeployV0/src/helm.ts

+17-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function getClusterType(): any {
3333
var connectionType = tl.getInput("connectionType", true);
3434
var endpoint = tl.getInput("azureSubscriptionEndpoint")
3535
if (connectionType === "Azure Resource Manager" && endpoint) {
36-
return require("./clusters/armkubernetescluster")
36+
return require("azure-pipelines-tasks-azure-arm-rest/aksUtility")
3737
}
3838

3939
return require("./clusters/generickubernetescluster")
@@ -51,13 +51,22 @@ function isKubConfigLogoutRequired(command: string): boolean {
5151

5252
// get kubeconfig file path
5353
async function getKubeConfigFile(): Promise<string> {
54-
return getClusterType().getKubeConfig().then((config) => {
55-
var configFilePath = getKubeConfigFilePath();
56-
tl.debug(tl.loc("KubeConfigFilePath", configFilePath));
57-
fs.writeFileSync(configFilePath, config);
58-
fs.chmodSync(configFilePath, '600');
59-
return configFilePath;
60-
});
54+
const connectionType = tl.getInput("connectionType", true)
55+
let result
56+
if (connectionType === "Azure Resource Manager") {
57+
const clusterName : string = tl.getInput("kubernetesCluster", true);
58+
const azureSubscriptionEndpoint : string = tl.getInput("azureSubscriptionEndpoint", true);
59+
const resourceGroup : string = tl.getInput("azureResourceGroup", true);
60+
const useClusterAdmin: boolean = tl.getBoolInput('useClusterAdmin');
61+
result = await getClusterType().getKubeConfig(azureSubscriptionEndpoint, resourceGroup, clusterName, useClusterAdmin)
62+
} else {
63+
result = await getClusterType().getKubeConfig()
64+
}
65+
let configFilePath = getKubeConfigFilePath();
66+
tl.debug(tl.loc("KubeConfigFilePath", configFilePath));
67+
fs.writeFileSync(configFilePath, result);
68+
fs.chmodSync(configFilePath, '600');
69+
return configFilePath;
6170
}
6271

6372
async function runHelmSaveCommand(helmCli: helmcli, kubectlCli: kubernetescli, failOnStderr: boolean): Promise<void> {

Tasks/HelmDeployV0/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
17-
"Patch": 2
16+
"Minor": 250,
17+
"Patch": 0
1818
},
1919
"demands": [],
2020
"groups": [

Tasks/HelmDeployV0/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
17-
"Patch": 2
16+
"Minor": 250,
17+
"Patch": 0
1818
},
1919
"demands": [],
2020
"groups": [

Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/HelmDeployV1/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@types/uuid": "^8.3.0",
77
"agent-base": "6.0.2",
88
"azure-pipelines-task-lib": "^4.13.0",
9-
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
9+
"azure-pipelines-tasks-azure-arm-rest": "3.250.0",
1010
"azure-pipelines-tasks-docker-common": "^2.242.0",
1111
"azure-pipelines-tasks-kubernetes-common": "^2.224.1",
1212
"azure-pipelines-tasks-securefiles-common": "^2.207.0",

0 commit comments

Comments
 (0)