Skip to content

Commit e1f26bb

Browse files
committed
Automatic name test
1 parent d5784a3 commit e1f26bb

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Cluster.bicep

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ var deploymentName = deployment().name
188188
// Used by the AKS agent pools to talk to the ACR
189189
// The actual cluster's identity does not need federation
190190
module kubeletId 'modules/userAssignedIdentity.bicep' = {
191-
name: '${deploymentName}_uai_kubelet'
191+
// name: '${deploymentName}_uai_kubelet'
192192
params: {
193193
baseName: '${baseName}-kubelet'
194194
location: location
@@ -202,7 +202,7 @@ module kubeletId 'modules/userAssignedIdentity.bicep' = {
202202
// IMPORTANT: If you're using your own Disks, StaticIP, KubeletId, Vnet or RouteTable ...
203203
// This user needs permissions on them
204204
module controlPlaneId 'modules/userAssignedIdentity.bicep' = {
205-
name: '${deploymentName}_uai_controlPlaneId'
205+
// name: '${deploymentName}_uai_controlPlaneId'
206206
params: {
207207
baseName: '${baseName}-aks'
208208
location: location
@@ -212,7 +212,7 @@ module controlPlaneId 'modules/userAssignedIdentity.bicep' = {
212212

213213
// For the KubeletId, Managed Identity Operator
214214
module kubelet_iam 'modules/resourceRoleAssignment.bicep' = {
215-
name: '${deploymentName}_kubelet_iam'
215+
// name: '${deploymentName}_kubelet_iam'
216216
params: {
217217
principalIds: [ controlPlaneId.outputs.principalId ]
218218
resourceId: kubeletId.outputs.id
@@ -222,7 +222,7 @@ module kubelet_iam 'modules/resourceRoleAssignment.bicep' = {
222222

223223
// We can't deploy the cluster until the control plane identity owns the kubelet identity
224224
module waitForRole 'modules/deploymentScript.bicep' = {
225-
name: '${deploymentName}_wait_role'
225+
// name: '${deploymentName}_wait_role'
226226
params: {
227227
name: 'waitForRoleAssignment'
228228
location: location
@@ -262,7 +262,7 @@ module waitForRole 'modules/deploymentScript.bicep' = {
262262

263263

264264
module keyVault 'modules/keyVault.bicep' = {
265-
name: '${deploymentName}_keyvault'
265+
// name: '${deploymentName}_keyvault'
266266
params: {
267267
baseName: baseName
268268
location: location
@@ -271,7 +271,7 @@ module keyVault 'modules/keyVault.bicep' = {
271271
}
272272

273273
module aks 'modules/managedCluster.bicep' = {
274-
name: '${deploymentName}_aks'
274+
// name: '${deploymentName}_aks'
275275
dependsOn: [ waitForRole ]
276276
params: {
277277
baseName: baseName
@@ -301,7 +301,7 @@ module aks 'modules/managedCluster.bicep' = {
301301
}
302302

303303
module fluxId 'modules/userAssignedIdentity.bicep' = {
304-
name: '${deploymentName}_uai_fluxId'
304+
// name: '${deploymentName}_uai_fluxId'
305305
params: {
306306
baseName: 'flux'
307307
location: location
@@ -323,7 +323,7 @@ param installFluxManually bool = false
323323

324324
// Managed Flux (obviously depends on the fluxId which depends on aks)
325325
module flux 'modules/flux.bicep' = if (!installFluxManually) {
326-
name: '${deploymentName}_flux'
326+
// name: '${deploymentName}_flux'
327327
params: {
328328
baseName: baseName
329329
identityClientId: fluxId.outputs.clientId
@@ -346,7 +346,7 @@ module flux 'modules/flux.bicep' = if (!installFluxManually) {
346346
// }
347347

348348
module iam_admin_aks 'modules/resourceRoleAssignment.bicep' = {
349-
name: '${deploymentName}_iam_admin_aks'
349+
// name: '${deploymentName}_iam_admin_aks'
350350
params: {
351351
principalIds: [ adminId ]
352352
resourceId: aks.outputs.id
@@ -355,7 +355,7 @@ module iam_admin_aks 'modules/resourceRoleAssignment.bicep' = {
355355
}
356356

357357
module iam_admin_kv_secrets 'modules/resourceRoleAssignment.bicep' = {
358-
name: '${deploymentName}_iam_admin_kv_secrets'
358+
// name: '${deploymentName}_iam_admin_kv_secrets'
359359
params: {
360360
principalIds: [ adminId ]
361361
resourceId: keyVault.outputs.id
@@ -364,7 +364,7 @@ module iam_admin_kv_secrets 'modules/resourceRoleAssignment.bicep' = {
364364
}
365365

366366
module iam_admin_kv_crypto 'modules/resourceRoleAssignment.bicep' = {
367-
name: '${deploymentName}_iam_admin_kv_crypto'
367+
// name: '${deploymentName}_iam_admin_kv_crypto'
368368
params: {
369369
principalIds: [ adminId ]
370370
resourceId: keyVault.outputs.id
@@ -373,7 +373,7 @@ module iam_admin_kv_crypto 'modules/resourceRoleAssignment.bicep' = {
373373
}
374374

375375
module iam_flux_crypto 'modules/resourceRoleAssignment.bicep' = {
376-
name: '${deploymentName}_iam_flux_crypto'
376+
// name: '${deploymentName}_iam_flux_crypto'
377377
params: {
378378
principalIds: [ fluxId.outputs.principalId ]
379379
resourceId: keyVault.outputs.id

modules/azureServiceOperator.bicep

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ param tags object = resourceGroup().tags
1919
param deploymentNamePrefix string = take(deployment().name, 64-17)
2020

2121

22-
module asoId 'userAssignedIdentity.bicep' = {
23-
name: '${deploymentNamePrefix}_uai_asoId'
22+
module aso 'userAssignedIdentity.bicep' = {
23+
// name: '${deploymentNamePrefix}_uai_aso'
2424
params: {
2525
baseName: baseName
2626
location: location
@@ -34,10 +34,10 @@ module asoId 'userAssignedIdentity.bicep' = {
3434

3535

3636
module iam_azure_owner 'resourceRoleAssignment.bicep' = {
37-
name: '${deploymentNamePrefix}_iam_aso_operator'
37+
// name: '${deploymentNamePrefix}_iam_aso_operator'
3838
params: {
39-
principalIds: [ asoId.outputs.principalId ]
40-
resourceId: asoId.outputs.id
39+
principalIds: [ aso.outputs.principalId ]
40+
resourceId: aso.outputs.id
4141
roleName: 'Contributor'
4242
}
4343
}

0 commit comments

Comments
 (0)