Skip to content

Commit 8629d02

Browse files
2208911 Create PR for the Azure-arm-rest Common lib and update relate… (#20466)
* 2208911 Create PR for the Azure-arm-rest Common lib and update related task * Test cases fixed for kubnetes task
1 parent 8882cc4 commit 8629d02

File tree

96 files changed

+890
-590
lines changed

Some content is hidden

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

96 files changed

+890
-590
lines changed

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

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json

Lines changed: 1 addition & 1 deletion
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.242.2",
24+
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
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/make.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"node_modules/azure-pipelines-tasks-kubernetes-common/node_modules/azure-pipelines-task-lib",
77
"node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib",
88
"node_modules/azure-pipelines-tool-lib/node_modules/azure-pipelines-task-lib",
9-
"node_modules/https-proxy-agent/node_modules/agent-base"
9+
"node_modules/https-proxy-agent/node_modules/agent-base",
10+
"node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/agent-base"
1011
],
1112
"options": "-Rf"
1213
}

Tasks/AzureFunctionOnKubernetesV1/package-lock.json

Lines changed: 78 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureFunctionOnKubernetesV1/package.json

Lines changed: 1 addition & 1 deletion
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.242.2",
24+
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
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/clusters/armkubernetescluster.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import tl = require('azure-pipelines-task-lib/task');
44
import { AzureAksService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-aks-service';
55
import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint';
6-
import { AzureEndpoint, AKSClusterAccessProfile} from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
6+
import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
77

88
// get kubeconfig file content
99
async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise<string> {
@@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG
1212

1313
tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup));
1414

15-
var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin);
16-
var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64');
15+
var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin);
16+
var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64');
1717
return base64Kubeconfig.toString();
1818
}
1919

Tasks/AzureFunctionOnKubernetesV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"version": {
1616
"Major": 1,
1717
"Minor": 246,
18-
"Patch": 0
18+
"Patch": 2
1919
},
2020
"demands": [],
2121
"groups": [

Tasks/AzureFunctionOnKubernetesV1/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"version": {
1616
"Major": 1,
1717
"Minor": 246,
18-
"Patch": 0
18+
"Patch": 2
1919
},
2020
"demands": [],
2121
"groups": [

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

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/HelmDeployV0/_buildConfigs/Node20/package.json

Lines changed: 1 addition & 1 deletion
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.242.2",
9+
"azure-pipelines-tasks-azure-arm-rest": "3.246.5",
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)