Skip to content

ARM ID annotations for ContainerService #19592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2022
Merged

ARM ID annotations for ContainerService #19592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions ...source-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2388,6 +2388,14 @@
},
"ContainerServiceVnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
},
"ContainerServiceVMSize": {
Expand Down Expand Up @@ -2675,11 +2683,27 @@
},
"vnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
"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}"
},
"podSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which pods will join when launched.",
"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}"
},
Expand Down Expand Up @@ -3596,6 +3620,7 @@
"properties": {
"id": {
"type": "string",
"format": "arm-id",
"description": "The fully qualified Azure resource id."
}
},
Expand Down Expand Up @@ -3943,6 +3968,14 @@
},
"diskEncryptionSetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Compute/diskEncryptionSets"
}
]
},
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
},
Expand Down Expand Up @@ -4114,6 +4147,14 @@
"properties": {
"resourceId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
]
},
"description": "The resource ID of the user assigned identity."
},
"clientId": {
Expand Down
58 changes: 58 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-05-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2059,6 +2059,14 @@
},
"ContainerServiceVnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
},
"ContainerServiceVMSize": {
Expand Down Expand Up @@ -2338,11 +2346,27 @@
},
"vnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
"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}"
},
"podSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which pods will join when launched.",
"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}"
},
Expand Down Expand Up @@ -2415,6 +2439,14 @@
},
"nodePublicIPPrefixID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/publicIPPrefixes"
}
]
},
"title": "The public IP prefix ID which VM nodes should use IPs from.",
"description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
},
Expand Down Expand Up @@ -3115,6 +3147,7 @@
"properties": {
"id": {
"type": "string",
"format": "arm-id",
"description": "The fully qualified Azure resource id."
}
},
Expand Down Expand Up @@ -3452,6 +3485,14 @@
},
"diskEncryptionSetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Compute/diskEncryptionSets"
}
]
},
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
},
Expand Down Expand Up @@ -3605,6 +3646,14 @@
"properties": {
"resourceId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
]
},
"description": "The resource ID of the user assigned identity."
},
"clientId": {
Expand Down Expand Up @@ -4188,6 +4237,14 @@
},
"ProximityPlacementGroupID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/proximityPlacementGroups"
}
]
},
"description": "The ID for Proximity Placement Group."
},
"CredentialResults": {
Expand Down Expand Up @@ -4449,6 +4506,7 @@
"privateLinkServiceID": {
"readOnly": true,
"type": "string",
"format": "arm-id",
"description": "The private link service ID of the resource, this field is exposed only to NRP internally."
}
}
Expand Down
66 changes: 66 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,14 @@
},
"ContainerServiceVnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
},
"ContainerServiceVMSize": {
Expand Down Expand Up @@ -2344,11 +2352,27 @@
},
"vnetSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which agent pool nodes and optionally pods will join on startup.",
"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}"
},
"podSubnetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
}
]
},
"title": "The ID of the subnet which pods will join when launched.",
"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}"
},
Expand Down Expand Up @@ -2426,6 +2450,14 @@
},
"nodePublicIPPrefixID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/publicIPPrefixes"
}
]
},
"title": "The public IP prefix ID which VM nodes should use IPs from.",
"description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
},
Expand Down Expand Up @@ -3179,6 +3211,7 @@
"properties": {
"id": {
"type": "string",
"format": "arm-id",
"description": "The fully qualified Azure resource id."
}
},
Expand Down Expand Up @@ -3512,6 +3545,14 @@
},
"diskEncryptionSetID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Compute/diskEncryptionSets"
}
]
},
"title": "The Resource ID of the disk encryption set to use for enabling encryption at rest.",
"description": "This is of the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{encryptionSetName}'"
},
Expand Down Expand Up @@ -3666,6 +3707,14 @@
"properties": {
"resourceId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
]
},
"description": "The resource ID of the user assigned identity."
},
"clientId": {
Expand Down Expand Up @@ -4271,6 +4320,14 @@
},
"ProximityPlacementGroupID": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/proximityPlacementGroups"
}
]
},
"description": "The ID for Proximity Placement Group."
},
"CredentialResults": {
Expand Down Expand Up @@ -4532,6 +4589,7 @@
"privateLinkServiceID": {
"readOnly": true,
"type": "string",
"format": "arm-id",
"description": "The private link service ID of the resource, this field is exposed only to NRP internally."
}
}
Expand Down Expand Up @@ -5038,6 +5096,14 @@
},
"logAnalyticsWorkspaceResourceId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.OperationalInsights/workspaces"
}
]
},
"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."
}
},
Expand Down
Loading