Skip to content

Commit da5fc11

Browse files
committed
sync changes from PR#19592 & PR#20145 (Azure#20402)
1 parent 9ab3c1a commit da5fc11

File tree

1 file changed

+67
-0
lines changed
  • specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview

1 file changed

+67
-0
lines changed

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,6 +3012,14 @@
30123012
},
30133013
"ContainerServiceVnetSubnetID": {
30143014
"type": "string",
3015+
"format": "arm-id",
3016+
"x-ms-arm-id-details": {
3017+
"allowedResources": [
3018+
{
3019+
"type": "Microsoft.Network/virtualNetworks/subnets"
3020+
}
3021+
]
3022+
},
30153023
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
30163024
},
30173025
"ContainerServiceVMSize": {
@@ -3302,11 +3310,27 @@
33023310
},
33033311
"vnetSubnetID": {
33043312
"type": "string",
3313+
"format": "arm-id",
3314+
"x-ms-arm-id-details": {
3315+
"allowedResources": [
3316+
{
3317+
"type": "Microsoft.Network/virtualNetworks/subnets"
3318+
}
3319+
]
3320+
},
33053321
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
33063322
"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}"
33073323
},
33083324
"podSubnetID": {
33093325
"type": "string",
3326+
"format": "arm-id",
3327+
"x-ms-arm-id-details": {
3328+
"allowedResources": [
3329+
{
3330+
"type": "Microsoft.Network/virtualNetworks/subnets"
3331+
}
3332+
]
3333+
},
33103334
"title": "The ID of the subnet which pods will join when launched.",
33113335
"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}"
33123336
},
@@ -3395,6 +3419,14 @@
33953419
},
33963420
"nodePublicIPPrefixID": {
33973421
"type": "string",
3422+
"format": "arm-id",
3423+
"x-ms-arm-id-details": {
3424+
"allowedResources": [
3425+
{
3426+
"type": "Microsoft.Network/publicIPPrefixes"
3427+
}
3428+
]
3429+
},
33983430
"title": "The public IP prefix ID which VM nodes should use IPs from.",
33993431
"description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
34003432
},
@@ -4133,6 +4165,7 @@
41334165
"properties": {
41344166
"id": {
41354167
"type": "string",
4168+
"format": "arm-id",
41364169
"description": "The fully qualified Azure resource id."
41374170
}
41384171
},
@@ -4494,6 +4527,14 @@
44944527
},
44954528
"diskEncryptionSetID": {
44964529
"type": "string",
4530+
"format": "arm-id",
4531+
"x-ms-arm-id-details": {
4532+
"allowedResources": [
4533+
{
4534+
"type": "Microsoft.Compute/diskEncryptionSets"
4535+
}
4536+
]
4537+
},
44974538
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
44984539
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
44994540
},
@@ -4708,6 +4749,14 @@
47084749
"properties": {
47094750
"resourceId": {
47104751
"type": "string",
4752+
"format": "arm-id",
4753+
"x-ms-arm-id-details": {
4754+
"allowedResources": [
4755+
{
4756+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
4757+
}
4758+
]
4759+
},
47114760
"description": "The resource ID of the user assigned identity."
47124761
},
47134762
"clientId": {
@@ -5351,6 +5400,14 @@
53515400
},
53525401
"ProximityPlacementGroupID": {
53535402
"type": "string",
5403+
"format": "arm-id",
5404+
"x-ms-arm-id-details": {
5405+
"allowedResources": [
5406+
{
5407+
"type": "Microsoft.Compute/proximityPlacementGroups"
5408+
}
5409+
]
5410+
},
53545411
"description": "The ID for Proximity Placement Group."
53555412
},
53565413
"CredentialResults": {
@@ -5618,6 +5675,7 @@
56185675
"privateLinkServiceID": {
56195676
"readOnly": true,
56205677
"type": "string",
5678+
"format": "arm-id",
56215679
"description": "The private link service ID of the resource, this field is exposed only to NRP internally."
56225680
}
56235681
}
@@ -6174,6 +6232,14 @@
61746232
"properties": {
61756233
"logAnalyticsWorkspaceResourceId": {
61766234
"type": "string",
6235+
"format": "arm-id",
6236+
"x-ms-arm-id-details": {
6237+
"allowedResources": [
6238+
{
6239+
"type": "Microsoft.OperationalInsights/workspaces"
6240+
}
6241+
]
6242+
},
61776243
"description": "Resource ID of the Log Analytics workspace to be associated with Microsoft Defender. When Microsoft Defender is enabled, this field is required and must be a valid workspace resource ID. When Microsoft Defender is disabled, leave the field empty."
61786244
},
61796245
"securityMonitoring": {
@@ -6356,6 +6422,7 @@
63566422
"properties": {
63576423
"sourceResourceId": {
63586424
"type": "string",
6425+
"format": "arm-id",
63596426
"description": "This is the ARM ID of the source object to be used to create the target object."
63606427
}
63616428
}

0 commit comments

Comments
 (0)