Put back the names

Author: Jaykul

.github/workflows/deploy.yaml

@@ -39,4 +39,4 @@ jobs:
         with:
           azPSVersion: "latest"
           inlineScript: |
-            $Results = New-AzResourceGroupDeployment -Name "aks-$(Get-Date -f yyyyMMddThhmmss)" -ResourceGroupName $Env:RESOURCEGROUP -TemplateFile ./Cluster.bicep -TemplateParameterObject @{ adminId = $Env:ADMINS }
+            $Results = New-AzResourceGroupDeployment -Name "$(Get-Date -f yyyyMMddTHHmm)_cluster" -ResourceGroupName $Env:RESOURCEGROUP -TemplateFile ./Cluster.bicep -TemplateParameterObject @{ adminId = $Env:ADMINS }

Cluster.bicep

@@ -188,7 +188,7 @@ var deploymentName = deployment().name
 // Used by the AKS agent pools to talk to the ACR
 // The actual cluster's identity does not need federation
 module kubeletId 'modules/userAssignedIdentity.bicep' = {
-  // name: '${deploymentName}_uai_kubelet'
+  name: '${deploymentName}_uai_kubelet'
   params: {
     baseName: '${baseName}-kubelet'
     location: location
@@ -202,7 +202,7 @@ module kubeletId 'modules/userAssignedIdentity.bicep' = {
 // IMPORTANT: If you're using your own Disks, StaticIP, KubeletId, Vnet or RouteTable ...
 // This user needs permissions on them
 module controlPlaneId 'modules/userAssignedIdentity.bicep' = {
-  // name: '${deploymentName}_uai_controlPlaneId'
+  name: '${deploymentName}_uai_controlPlaneId'
   params: {
     baseName: '${baseName}-aks'
     location: location
@@ -212,7 +212,7 @@ module controlPlaneId 'modules/userAssignedIdentity.bicep' = {
 
 // For the KubeletId, Managed Identity Operator
 module kubelet_iam 'modules/resourceRoleAssignment.bicep' = {
-  // name: '${deploymentName}_kubelet_iam'
+  name: '${deploymentName}_kubelet_iam'
   params: {
     principalIds: [ controlPlaneId.outputs.principalId ]
     resourceId: kubeletId.outputs.id
@@ -222,7 +222,7 @@ module kubelet_iam 'modules/resourceRoleAssignment.bicep' = {
 
 // We can't deploy the cluster until the control plane identity owns the kubelet identity
 module waitForRole 'modules/deploymentScript.bicep' = {
-  // name: '${deploymentName}_wait_role'
+  name: '${deploymentName}_wait_role'
   params: {
     name: 'waitForRoleAssignment'
     location: location
@@ -262,7 +262,7 @@ module waitForRole 'modules/deploymentScript.bicep' = {
 
 
 module keyVault 'modules/keyVault.bicep' = {
-  // name: '${deploymentName}_keyvault'
+  name: '${deploymentName}_keyvault'
   params: {
     baseName: baseName
     location: location
@@ -271,7 +271,7 @@ module keyVault 'modules/keyVault.bicep' = {
 }
 
 module aks 'modules/managedCluster.bicep' = {
-  // name: '${deploymentName}_aks'
+  name: '${deploymentName}_aks'
   dependsOn: [ waitForRole ]
   params: {
     baseName: baseName
@@ -301,7 +301,7 @@ module aks 'modules/managedCluster.bicep' = {
 }
 
 module fluxId 'modules/userAssignedIdentity.bicep' = {
-  // name: '${deploymentName}_uai_fluxId'
+  name: '${deploymentName}_uai_fluxId'
   params: {
     baseName: 'flux'
     location: location
@@ -323,7 +323,7 @@ param installFluxManually bool = false
 
 // Managed Flux (obviously depends on the fluxId which depends on aks)
 module flux 'modules/flux.bicep' = if (!installFluxManually) {
-  // name: '${deploymentName}_flux'
+  name: '${deploymentName}_flux'
   params: {
     baseName: baseName
     identityClientId: fluxId.outputs.clientId
@@ -346,7 +346,7 @@ module flux 'modules/flux.bicep' = if (!installFluxManually) {
 // }
 
 module iam_admin_aks 'modules/resourceRoleAssignment.bicep' = {
-  // name: '${deploymentName}_iam_admin_aks'
+  name: '${deploymentName}_iam_admin_aks'
   params: {
     principalIds: [ adminId ]
     resourceId: aks.outputs.id
@@ -355,7 +355,7 @@ module iam_admin_aks 'modules/resourceRoleAssignment.bicep' = {
 }
 
 module iam_admin_kv_secrets 'modules/resourceRoleAssignment.bicep' = {
-  // name: '${deploymentName}_iam_admin_kv_secrets'
+  name: '${deploymentName}_iam_admin_kv_secrets'
   params: {
     principalIds: [ adminId ]
     resourceId: keyVault.outputs.id
@@ -364,7 +364,7 @@ module iam_admin_kv_secrets 'modules/resourceRoleAssignment.bicep' = {
 }
 
 module iam_admin_kv_crypto 'modules/resourceRoleAssignment.bicep' = {
-  // name: '${deploymentName}_iam_admin_kv_crypto'
+  name: '${deploymentName}_iam_admin_kv_crypto'
   params: {
     principalIds: [ adminId ]
     resourceId: keyVault.outputs.id
@@ -373,7 +373,7 @@ module iam_admin_kv_crypto 'modules/resourceRoleAssignment.bicep' = {
 }
 
 module iam_flux_crypto 'modules/resourceRoleAssignment.bicep' = {
-  // name: '${deploymentName}_iam_flux_crypto'
+  name: '${deploymentName}_iam_flux_crypto'
   params: {
     principalIds: [ fluxId.outputs.principalId ]
     resourceId: keyVault.outputs.id

Initialize-Azure.ps1

@@ -22,6 +22,8 @@ param(
     [string]$Repository = "PoshCode/aks-bicep"
 )
 
+$BaseName = $BaseName.ToLowerInvariant()
+
 # The resource group to create. E.g. "rg-cluster"
 $resourceGroupName = @(
     # The first one should be the one where the cluster will be deployed

modules/azureServiceOperator.bicep

@@ -20,7 +20,7 @@ param deploymentNamePrefix string = take(deployment().name, 64-17)
 
 
 module aso 'userAssignedIdentity.bicep' = {
-  // name: '${deploymentNamePrefix}_uai_aso'
+  name: '${deploymentNamePrefix}_uai_aso'
   params: {
     baseName: baseName
     location: location
@@ -34,10 +34,10 @@ module aso 'userAssignedIdentity.bicep' = {
 
 
 module iam_azure_owner 'resourceRoleAssignment.bicep' = {
-  // name: '${deploymentNamePrefix}_iam_aso_operator'
+  name: '${deploymentNamePrefix}_iam_aso_operator'
   params: {
     principalIds: [ aso.outputs.principalId ]
-    resourceId: aso.outputs.id
+    resourceId: resourceGroup().id
     roleName: 'Contributor'
   }
 }