Skip to content

Commit c0f7fc0

Browse files
matthchrmatthchr
committed
ARM ID annotations for ContainerService
1 parent f4e7a1c commit c0f7fc0

File tree

11 files changed

+701
-0
lines changed

11 files changed

+701
-0
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,6 +2388,14 @@
23882388
},
23892389
"ContainerServiceVnetSubnetID": {
23902390
"type": "string",
2391+
"format": "arm-id",
2392+
"x-ms-arm-id-details": {
2393+
"allowedResources": [
2394+
{
2395+
"type": "Microsoft.Network/virtualNetworks/subnets"
2396+
}
2397+
]
2398+
},
23912399
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
23922400
},
23932401
"ContainerServiceVMSize": {
@@ -2675,11 +2683,27 @@
26752683
},
26762684
"vnetSubnetID": {
26772685
"type": "string",
2686+
"format": "arm-id",
2687+
"x-ms-arm-id-details": {
2688+
"allowedResources": [
2689+
{
2690+
"type": "Microsoft.Network/virtualNetworks/subnets"
2691+
}
2692+
]
2693+
},
26782694
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
26792695
"description": "If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified, this applies to nodes and pods, otherwise it applies to just nodes. This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
26802696
},
26812697
"podSubnetID": {
26822698
"type": "string",
2699+
"format": "arm-id",
2700+
"x-ms-arm-id-details": {
2701+
"allowedResources": [
2702+
{
2703+
"type": "Microsoft.Network/virtualNetworks/subnets"
2704+
}
2705+
]
2706+
},
26832707
"title": "The ID of the subnet which pods will join when launched.",
26842708
"description": "If omitted, pod IPs are statically assigned on the node subnet (see vnetSubnetID for more details). This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
26852709
},
@@ -3596,6 +3620,7 @@
35963620
"properties": {
35973621
"id": {
35983622
"type": "string",
3623+
"format": "arm-id",
35993624
"description": "The fully qualified Azure resource id."
36003625
}
36013626
},
@@ -3943,6 +3968,14 @@
39433968
},
39443969
"diskEncryptionSetID": {
39453970
"type": "string",
3971+
"format": "arm-id",
3972+
"x-ms-arm-id-details": {
3973+
"allowedResources": [
3974+
{
3975+
"type": "Microsoft.Compute/diskEncryptionSets"
3976+
}
3977+
]
3978+
},
39463979
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
39473980
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
39483981
},
@@ -4114,6 +4147,14 @@
41144147
"properties": {
41154148
"resourceId": {
41164149
"type": "string",
4150+
"format": "arm-id",
4151+
"x-ms-arm-id-details": {
4152+
"allowedResources": [
4153+
{
4154+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
4155+
}
4156+
]
4157+
},
41174158
"description": "The resource ID of the user assigned identity."
41184159
},
41194160
"clientId": {

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-05-01/managedClusters.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2059,6 +2059,14 @@
20592059
},
20602060
"ContainerServiceVnetSubnetID": {
20612061
"type": "string",
2062+
"format": "arm-id",
2063+
"x-ms-arm-id-details": {
2064+
"allowedResources": [
2065+
{
2066+
"type": "Microsoft.Network/virtualNetworks/subnets"
2067+
}
2068+
]
2069+
},
20622070
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
20632071
},
20642072
"ContainerServiceVMSize": {
@@ -2338,11 +2346,27 @@
23382346
},
23392347
"vnetSubnetID": {
23402348
"type": "string",
2349+
"format": "arm-id",
2350+
"x-ms-arm-id-details": {
2351+
"allowedResources": [
2352+
{
2353+
"type": "Microsoft.Network/virtualNetworks/subnets"
2354+
}
2355+
]
2356+
},
23412357
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
23422358
"description": "If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified, this applies to nodes and pods, otherwise it applies to just nodes. This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
23432359
},
23442360
"podSubnetID": {
23452361
"type": "string",
2362+
"format": "arm-id",
2363+
"x-ms-arm-id-details": {
2364+
"allowedResources": [
2365+
{
2366+
"type": "Microsoft.Network/virtualNetworks/subnets"
2367+
}
2368+
]
2369+
},
23462370
"title": "The ID of the subnet which pods will join when launched.",
23472371
"description": "If omitted, pod IPs are statically assigned on the node subnet (see vnetSubnetID for more details). This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
23482372
},
@@ -2415,6 +2439,14 @@
24152439
},
24162440
"nodePublicIPPrefixID": {
24172441
"type": "string",
2442+
"format": "arm-id",
2443+
"x-ms-arm-id-details": {
2444+
"allowedResources": [
2445+
{
2446+
"type": "Microsoft.Network/publicIPPrefixes"
2447+
}
2448+
]
2449+
},
24182450
"title": "The public IP prefix ID which VM nodes should use IPs from.",
24192451
"description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
24202452
},
@@ -3115,6 +3147,7 @@
31153147
"properties": {
31163148
"id": {
31173149
"type": "string",
3150+
"format": "arm-id",
31183151
"description": "The fully qualified Azure resource id."
31193152
}
31203153
},
@@ -3452,6 +3485,14 @@
34523485
},
34533486
"diskEncryptionSetID": {
34543487
"type": "string",
3488+
"format": "arm-id",
3489+
"x-ms-arm-id-details": {
3490+
"allowedResources": [
3491+
{
3492+
"type": "Microsoft.Compute/diskEncryptionSets"
3493+
}
3494+
]
3495+
},
34553496
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
34563497
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
34573498
},
@@ -3605,6 +3646,14 @@
36053646
"properties": {
36063647
"resourceId": {
36073648
"type": "string",
3649+
"format": "arm-id",
3650+
"x-ms-arm-id-details": {
3651+
"allowedResources": [
3652+
{
3653+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
3654+
}
3655+
]
3656+
},
36083657
"description": "The resource ID of the user assigned identity."
36093658
},
36103659
"clientId": {
@@ -4188,6 +4237,14 @@
41884237
},
41894238
"ProximityPlacementGroupID": {
41904239
"type": "string",
4240+
"format": "arm-id",
4241+
"x-ms-arm-id-details": {
4242+
"allowedResources": [
4243+
{
4244+
"type": "Microsoft.Network/proximityPlacementGroups"
4245+
}
4246+
]
4247+
},
41914248
"description": "The ID for Proximity Placement Group."
41924249
},
41934250
"CredentialResults": {
@@ -4449,6 +4506,7 @@
44494506
"privateLinkServiceID": {
44504507
"readOnly": true,
44514508
"type": "string",
4509+
"format": "arm-id",
44524510
"description": "The private link service ID of the resource, this field is exposed only to NRP internally."
44534511
}
44544512
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,6 +2065,14 @@
20652065
},
20662066
"ContainerServiceVnetSubnetID": {
20672067
"type": "string",
2068+
"format": "arm-id",
2069+
"x-ms-arm-id-details": {
2070+
"allowedResources": [
2071+
{
2072+
"type": "Microsoft.Network/virtualNetworks/subnets"
2073+
}
2074+
]
2075+
},
20682076
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
20692077
},
20702078
"ContainerServiceVMSize": {
@@ -2344,11 +2352,27 @@
23442352
},
23452353
"vnetSubnetID": {
23462354
"type": "string",
2355+
"format": "arm-id",
2356+
"x-ms-arm-id-details": {
2357+
"allowedResources": [
2358+
{
2359+
"type": "Microsoft.Network/virtualNetworks/subnets"
2360+
}
2361+
]
2362+
},
23472363
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
23482364
"description": "If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified, this applies to nodes and pods, otherwise it applies to just nodes. This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
23492365
},
23502366
"podSubnetID": {
23512367
"type": "string",
2368+
"format": "arm-id",
2369+
"x-ms-arm-id-details": {
2370+
"allowedResources": [
2371+
{
2372+
"type": "Microsoft.Network/virtualNetworks/subnets"
2373+
}
2374+
]
2375+
},
23522376
"title": "The ID of the subnet which pods will join when launched.",
23532377
"description": "If omitted, pod IPs are statically assigned on the node subnet (see vnetSubnetID for more details). This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
23542378
},
@@ -2426,6 +2450,14 @@
24262450
},
24272451
"nodePublicIPPrefixID": {
24282452
"type": "string",
2453+
"format": "arm-id",
2454+
"x-ms-arm-id-details": {
2455+
"allowedResources": [
2456+
{
2457+
"type": "Microsoft.Network/publicIPPrefixes"
2458+
}
2459+
]
2460+
},
24292461
"title": "The public IP prefix ID which VM nodes should use IPs from.",
24302462
"description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
24312463
},
@@ -3179,6 +3211,7 @@
31793211
"properties": {
31803212
"id": {
31813213
"type": "string",
3214+
"format": "arm-id",
31823215
"description": "The fully qualified Azure resource id."
31833216
}
31843217
},
@@ -3512,6 +3545,14 @@
35123545
},
35133546
"diskEncryptionSetID": {
35143547
"type": "string",
3548+
"format": "arm-id",
3549+
"x-ms-arm-id-details": {
3550+
"allowedResources": [
3551+
{
3552+
"type": "Microsoft.Compute/diskEncryptionSets"
3553+
}
3554+
]
3555+
},
35153556
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
35163557
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
35173558
},
@@ -3666,6 +3707,14 @@
36663707
"properties": {
36673708
"resourceId": {
36683709
"type": "string",
3710+
"format": "arm-id",
3711+
"x-ms-arm-id-details": {
3712+
"allowedResources": [
3713+
{
3714+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
3715+
}
3716+
]
3717+
},
36693718
"description": "The resource ID of the user assigned identity."
36703719
},
36713720
"clientId": {
@@ -4271,6 +4320,14 @@
42714320
},
42724321
"ProximityPlacementGroupID": {
42734322
"type": "string",
4323+
"format": "arm-id",
4324+
"x-ms-arm-id-details": {
4325+
"allowedResources": [
4326+
{
4327+
"type": "Microsoft.Network/proximityPlacementGroups"
4328+
}
4329+
]
4330+
},
42744331
"description": "The ID for Proximity Placement Group."
42754332
},
42764333
"CredentialResults": {
@@ -4532,6 +4589,7 @@
45324589
"privateLinkServiceID": {
45334590
"readOnly": true,
45344591
"type": "string",
4592+
"format": "arm-id",
45354593
"description": "The private link service ID of the resource, this field is exposed only to NRP internally."
45364594
}
45374595
}
@@ -5038,6 +5096,14 @@
50385096
},
50395097
"logAnalyticsWorkspaceResourceId": {
50405098
"type": "string",
5099+
"format": "arm-id",
5100+
"x-ms-arm-id-details": {
5101+
"allowedResources": [
5102+
{
5103+
"type": "Microsoft.OperationalInsights/workspaces"
5104+
}
5105+
]
5106+
},
50415107
"description": "Resource ID of the Log Analytics workspace to be associated with Azure Defender. When Azure Defender is enabled, this field is required and must be a valid workspace resource ID. When Azure Defender is disabled, this field should not be exists."
50425108
}
50435109
},

0 commit comments

Comments
 (0)