Skip to content

Commit fde1edd

Browse files
PhilipsonJosephPhilipsonJoseph
authored
Bug 2222573: [BUG]: HelmDeploy and Kubernetes task on version 246 is having authorization issue on fetching credential of AKS cluster (#20547)
1 parent 79e48e7 commit fde1edd

Some content is hidden

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

54 files changed

+431
-445
lines changed

‎Tasks/AzureFunctionOnKubernetesV1/Tests/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/AzureFunctionOnKubernetesV1/package-lock.json

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

‎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, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
6+
import { AzureEndpoint, AKSClusterAccessProfile} 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 : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin);
16-
var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64');
15+
var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin);
16+
var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, '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": 247,
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": 247,
18-
"Patch": 0
18+
"Patch": 2
1919
},
2020
"demands": [],
2121
"groups": [

‎Tasks/HelmDeployV0/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, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
6+
import { AzureEndpoint, AKSClusterAccessProfile} 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 : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin);
16-
var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64');
15+
var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin);
16+
var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64');
1717
return base64Kubeconfig.toString();
1818
}
1919

‎Tasks/HelmDeployV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 246,
16+
"Minor": 247,
1717
"Patch": 0
1818
},
1919
"demands": [],

‎Tasks/HelmDeployV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 246,
16+
"Minor": 247,
1717
"Patch": 0
1818
},
1919
"demands": [],

‎Tasks/HelmDeployV1/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, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
6+
import { AzureEndpoint, AKSClusterAccessProfile} 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 : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin);
16-
var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64');
15+
var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin);
16+
var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64');
1717
return base64Kubeconfig.toString();
1818
}
1919

‎Tasks/HelmDeployV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 246,
16+
"Minor": 247,
1717
"Patch": 0
1818
},
1919
"demands": [],

0 commit comments

Comments
 (0)