Skip to content

Commit eda6aaa

Browse files
Cluster connection bump (#20957)
1 parent 7412880 commit eda6aaa

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

Diff for: Tasks/KubernetesManifestV1/Strings/resources.resjson/en-US/resources.resjson

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
"loc.input.help.dockerRegistryEndpoint": "Select a Docker registry service connection. Required for commands that need to authenticate with a registry.",
7474
"loc.input.label.rolloutStatusTimeout": "Timeout for rollout status",
7575
"loc.input.help.rolloutStatusTimeout": "The length of time (in seconds) to wait before ending watch on rollout status",
76+
"loc.input.label.resourceType": "Resource type",
77+
"loc.input.help.resourceType": "The type of the resource (fleet, managed cluster)",
7678
"loc.messages.DownloadPathForStableTxt": "Download path for stable.txt: %s",
7779
"loc.messages.DownloadKubeCtlFailed": "Can not download the kubectl client of version %s. Check if the version is correct https://github.com/kubernetes/kubernetes/releases",
7880
"loc.messages.DownloadStableVersionFailed": "Can not download kubernetes stable version file from %s. Falling back to %s",

Diff for: Tasks/KubernetesManifestV1/_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.

Diff for: Tasks/KubernetesManifestV1/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@types/uuid": "^8.3.0",
99
"agent-base": "^6.0.2",
1010
"azure-pipelines-task-lib": "^4.11.0",
11-
"azure-pipelines-tasks-azure-arm-rest": "3.254.0",
11+
"azure-pipelines-tasks-azure-arm-rest": "3.254.2",
1212
"azure-pipelines-tasks-docker-common": "2.242.0",
1313
"azure-pipelines-tasks-kubernetes-common": "^2.224.1",
1414
"azure-pipelines-tasks-utility-common": "^3.210.0",

Diff for: Tasks/KubernetesManifestV1/src/clusterconnection.ts

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ export default class ClusterConnection {
3838
const azureSubscriptionEndpoint : string = tl.getInput("azureSubscriptionEndpoint", true);
3939
const resourceGroup : string = tl.getInput("azureResourceGroup", true);
4040
const useClusterAdmin: boolean = tl.getBoolInput('useClusterAdmin');
41+
const resourceType: string = (tl.getInput("resourceType", false) || "Microsoft.ContainerService/managedClusters");
42+
if (resourceType.toLowerCase() == "microsoft.containerservice/fleets"){
43+
return this.loadClusterType(connectionType).getKubeConfigForFleet(azureSubscriptionEndpoint, resourceGroup, clusterName)
44+
}
4145
return this.loadClusterType(connectionType).getKubeConfig(azureSubscriptionEndpoint, resourceGroup, clusterName, useClusterAdmin)
4246
} else {
4347
return this.loadClusterType(connectionType).getKubeConfig()

Diff for: Tasks/KubernetesManifestV1/task.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 255,
17-
"Patch": 2
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"groups": [],
@@ -398,6 +398,15 @@
398398
"expression": "isMatch(value, '(^\\d*$)','Multiline')",
399399
"message": "Enter a valid value for timeout."
400400
}
401+
},
402+
{
403+
"name": "resourceType",
404+
"type": "string",
405+
"label": "Resource type",
406+
"defaultValue": "Microsoft.ContainerService/managedClusters",
407+
"required": false,
408+
"helpMarkDown": "The type of the resource (fleet, managed cluster)",
409+
"visibleRule": "action = deploy"
401410
}
402411
],
403412
"dataSourceBindings": [

Diff for: Tasks/KubernetesManifestV1/task.loc.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 255,
17-
"Patch": 2
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"groups": [],
@@ -398,6 +398,15 @@
398398
"expression": "isMatch(value, '(^\\d*$)','Multiline')",
399399
"message": "Enter a valid value for timeout."
400400
}
401+
},
402+
{
403+
"name": "resourceType",
404+
"type": "string",
405+
"label": "ms-resource:loc.input.label.resourceType",
406+
"defaultValue": "Microsoft.ContainerService/managedClusters",
407+
"required": false,
408+
"helpMarkDown": "ms-resource:loc.input.help.resourceType",
409+
"visibleRule": "action = deploy"
401410
}
402411
],
403412
"dataSourceBindings": [

0 commit comments

Comments
 (0)