Skip to content
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

Jump to bottom

ManagedCluster - WebAppRouting - Updates #4195

Merged
merged 5 commits into from
Dec 7, 2023
Merged

ManagedCluster - WebAppRouting - Updates #4195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4494167
Update main.bicep
coolhome Nov 6, 2023
5021551
Update module
coolhome Dec 6, 2023
a9f0879
Merge branch 'main' into patch-3
coolhome Dec 6, 2023
f522777
Merge remote-tracking branch 'origin/main' into patch-3
coolhome Dec 7, 2023
3811f3e
Upgraded bicep, re-ran
coolhome Dec 7, 2023
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
1 change: 1 addition & 0 deletions modules/container-service/managed-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,6 +2435,7 @@ Specifies whether the webApplicationRoutingEnabled add-on is enabled or not.
| `resourceGroupName` | string | The resource group the managed cluster was deployed into. |
| `resourceId` | string | The resource ID of the managed cluster. |
| `systemAssignedMIPrincipalId` | string | The principal ID of the system assigned identity. |
| `webAppRoutingIdentityObjectId` | string | The Object ID of Web Application Routing. |

## Cross-referenced modules

Expand Down
5 changes: 4 additions & 1 deletion modules/container-service/managed-cluster/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ resource managedCluster_roleAssignments 'Microsoft.Authorization/roleAssignments
scope: managedCluster
}]

resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' existing = if (dnsZoneResourceId != null && webApplicationRoutingEnabled) {
resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' existing = if (enableDnsZoneContributorRoleAssignment == true && dnsZoneResourceId != null && webApplicationRoutingEnabled) {
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
name: last(split((!empty(dnsZoneResourceId) ? dnsZoneResourceId : '/dummmyZone'), '/'))!
}

Expand Down Expand Up @@ -762,6 +762,9 @@ output oidcIssuerUrl string = enableOidcIssuerProfile ? managedCluster.propertie
@description('The addonProfiles of the Kubernetes cluster.')
output addonProfiles object = contains(managedCluster.properties, 'addonProfiles') ? managedCluster.properties.addonProfiles : {}

@description('The Object ID of Web Application Routing.')
output webAppRoutingIdentityObjectId string = contains(managedCluster.properties, 'ingressProfile') && contains(managedCluster.properties.ingressProfile, 'webAppRouting') && contains(managedCluster.properties.ingressProfile.webAppRouting, 'identity') && contains(managedCluster.properties.ingressProfile.webAppRouting.identity, 'objectId') ? managedCluster.properties.ingressProfile.webAppRouting.identity.objectId : ''

// =============== //
// Definitions //
// =============== //
Expand Down
11 changes: 9 additions & 2 deletions modules/container-service/managed-cluster/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.23.1.45101",
"templateHash": "609013537229775592"
"templateHash": "1679575632831341410"
},
"name": "Azure Kubernetes Service (AKS) Managed Clusters",
"description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster.",
Expand Down Expand Up @@ -1286,7 +1286,7 @@
]
},
"dnsZone": {
"condition": "[and(not(equals(parameters('dnsZoneResourceId'), null())), parameters('webApplicationRoutingEnabled'))]",
"condition": "[and(and(equals(parameters('enableDnsZoneContributorRoleAssignment'), true()), not(equals(parameters('dnsZoneResourceId'), null()))), parameters('webApplicationRoutingEnabled'))]",
"existing": true,
"type": "Microsoft.Network/dnsZones",
"apiVersion": "2018-05-01",
Expand Down Expand Up @@ -2261,6 +2261,13 @@
"description": "The addonProfiles of the Kubernetes cluster."
},
"value": "[if(contains(reference('managedCluster'), 'addonProfiles'), reference('managedCluster').addonProfiles, createObject())]"
},
"webAppRoutingIdentityObjectId": {
"type": "string",
"metadata": {
"description": "The Object ID of Web Application Routing."
},
"value": "[if(and(and(and(contains(reference('managedCluster'), 'ingressProfile'), contains(reference('managedCluster').ingressProfile, 'webAppRouting')), contains(reference('managedCluster').ingressProfile.webAppRouting, 'identity')), contains(reference('managedCluster').ingressProfile.webAppRouting.identity, 'objectId')), reference('managedCluster').ingressProfile.webAppRouting.identity.objectId, '')]"
}
}
}