Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .azuredevops/platformPipelines/platform.dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,9 @@ stages:
- path: $(dependencyPath)/$(resourceType)/parameters/lb.parameters.json
templateFilePath: $(templateFilePath)
displayName: Load balancer Public IP
- path: $(dependencyPath)/$(resourceType)/parameters/lb.min.parameters.json
templateFilePath: $(templateFilePath)
displayName: Min Load balancer Public IP
- path: $(dependencyPath)/$(resourceType)/parameters/fw.parameters.json
templateFilePath: $(templateFilePath)
displayName: Firewall Public IP
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/platform.dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ jobs:
'apgw.parameters.json',
'bas.parameters.json',
'lb.parameters.json',
'lb.min.parameters.json',
'fw.parameters.json',
]
steps:
Expand Down
18 changes: 9 additions & 9 deletions arm/Microsoft.ContainerService/managedClusters/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01' = {
resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-10-01' = {
name: name
location: location
tags: (empty(tags) ? null : tags)
Expand All @@ -284,7 +284,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01'
omsagent: {
enabled: omsAgentEnabled && !empty(monitoringWorkspaceId)
config: {
logAnalyticsWorkspaceResourceID: !empty(monitoringWorkspaceId) ? monitoringWorkspaceId : null
logAnalyticsWorkspaceResourceID: !empty(monitoringWorkspaceId) ? any(monitoringWorkspaceId) : null
}
}
aciConnectorLinux: {
Expand All @@ -303,15 +303,15 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01'
enableRBAC: aadProfileEnableAzureRBAC
nodeResourceGroup: nodeResourceGroup
networkProfile: {
networkPlugin: (empty(aksClusterNetworkPlugin) ? null : aksClusterNetworkPlugin)
networkPolicy: (empty(aksClusterNetworkPolicy) ? null : aksClusterNetworkPolicy)
podCidr: (empty(aksClusterPodCidr) ? null : aksClusterPodCidr)
serviceCidr: (empty(aksClusterServiceCidr) ? null : aksClusterServiceCidr)
dnsServiceIP: (empty(aksClusterDnsServiceIP) ? null : aksClusterDnsServiceIP)
dockerBridgeCidr: (empty(aksClusterDockerBridgeCidr) ? null : aksClusterDockerBridgeCidr)
networkPlugin: !empty(aksClusterNetworkPlugin) ? any(aksClusterNetworkPlugin) : null
networkPolicy: !empty(aksClusterNetworkPolicy) ? any(aksClusterNetworkPolicy) : null
podCidr: !empty(aksClusterPodCidr) ? aksClusterPodCidr : null
serviceCidr: !empty(aksClusterServiceCidr) ? aksClusterServiceCidr : null
dnsServiceIP: !empty(aksClusterDnsServiceIP) ? aksClusterDnsServiceIP : null
dockerBridgeCidr: !empty(aksClusterDockerBridgeCidr) ? aksClusterDockerBridgeCidr : null
outboundType: aksClusterOutboundType
loadBalancerSku: aksClusterLoadBalancerSku
loadBalancerProfile: ((managedOutboundIPCount == 0) ? null : lbProfile)
loadBalancerProfile: managedOutboundIPCount != 0 ? lbProfile : null
}
aadProfile: {
clientAppID: aadProfileClientAppID
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.ContainerService/managedClusters/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This module deploys Azure Kubernetes Cluster (AKS).
| :-- | :-- |
| `Microsoft.Authorization/locks` | 2017-04-01 |
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.ContainerService/managedClusters` | 2021-07-01 |
| `Microsoft.ContainerService/managedClusters` | 2021-10-01 |
| `Microsoft.ContainerService/managedClusters/agentPools` | 2021-08-01 |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |

Expand Down Expand Up @@ -209,6 +209,6 @@ You can specify multiple user assigned identities to a resource by providing add

- [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
- [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
- [Managedclusters](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-07-01/managedClusters)
- [Managedclusters](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-10-01/managedClusters)
- [Managedclusters/Agentpools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-08-01/managedClusters/agentPools)
- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"value": [
{
"name": "publicIPConfig1",
"publicIPAddressId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-x-lb",
"publicIPAddressId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<<namePrefix>>-az-pip-min-lb",
"subnetId": "",
"privateIPAddress": ""
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-az-pip-min-lb"
},
"skuName": {
"value": "Standard"
},
"publicIPAllocationMethod": {
"value": "Static"
}
}
}