Skip to content

Align Microsoft.ContainerRegistry deployment names #735

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
eriqua merged 2 commits into from
Dec 6, 2021
Merged

Align Microsoft.ContainerRegistry deployment names #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ab892c
Align aks deployment names
Dec 4, 2021
1c4247d
Align acr deployment names
Dec 4, 2021
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
6 changes: 3 additions & 3 deletions arm/Microsoft.ContainerRegistry/registries/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,16 @@ resource registry_diagnosticSettingName 'Microsoft.Insights/diagnosticsettings@2
}

module registry_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ContainerRegistry-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
resourceId: registry.id
}
}]

module registry_privateEndpoints '.bicep/nested_privateEndpoints.bicep' = [for privateEndpoint in privateEndpoints: {
name: '${uniqueString(deployment().name, privateEndpoint.name)}-privateEndpoint'
module registry_privateEndpoints '.bicep/nested_privateEndpoints.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
name: '${uniqueString(deployment().name, location)}-ContainerRegistry-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: registry.id
privateEndpointVnetLocation: empty(privateEndpoints) ? 'dummy' : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.ContainerService/managedClusters/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01'
}

module managedCluster_agentPools 'agentPools/deploy.bicep' = [for (agentPool, index) in agentPools: {
name: '${managedCluster.name}-agentPool-${index}'
name: '${uniqueString(deployment().name, location)}-ManagedCluster-AgentPool-${index}'
params: {
managedClusterName: managedCluster.name
name: agentPool.name
Expand Down Expand Up @@ -367,7 +367,7 @@ resource managedCluster_diagnosticSettings 'Microsoft.Insights/diagnosticsetting
}

module managedCluster_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ManagedCluster-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down