Update to latest

Azure · Oct 14, 2024 · c3b4643 · c3b4643
2 parents c0d3576 + 4100f65
commit c3b4643
Show file tree

Hide file tree

Showing 41 changed files with 1,627 additions and 6,706 deletions.
diff --git a/avm/ptn/azd/aks/README.md b/avm/ptn/azd/aks/README.md
@@ -35,8 +35,8 @@ Creates an Azure Kubernetes Service (AKS) cluster with a system agent pool as we
 | `Microsoft.KeyVault/vaults/secrets` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/secrets) |
 | `Microsoft.KubernetesConfiguration/extensions` | [2022-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KubernetesConfiguration/2022-03-01/extensions) |
 | `Microsoft.KubernetesConfiguration/fluxConfigurations` | [2022-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KubernetesConfiguration/2022-03-01/fluxConfigurations) |
-| `Microsoft.Network/privateEndpoints` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints) |
-| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints/privateDnsZoneGroups) |
+| `Microsoft.Network/privateEndpoints` | [2023-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-11-01/privateEndpoints) |
+| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | [2023-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-11-01/privateEndpoints/privateDnsZoneGroups) |
 
 ## Usage examples
 
@@ -70,6 +70,7 @@ module aks 'br/public:avm/ptn/azd/aks:<version>' = {
     principalId: '<principalId>'
     // Non-required parameters
     location: '<location>'
+    principalType: 'ServicePrincipal'
   }
 }
 ```
@@ -105,6 +106,9 @@ module aks 'br/public:avm/ptn/azd/aks:<version>' = {
     // Non-required parameters
     "location": {
       "value": "<location>"
+    },
+    "principalType": {
+      "value": "ServicePrincipal"
     }
   }
 }
@@ -128,6 +132,7 @@ param name = '<name>'
 param principalId = '<principalId>'
 // Non-required parameters
 param location = '<location>'
+param principalType = 'ServicePrincipal'
 ```
 
 </details>
@@ -162,7 +167,7 @@ module aks 'br/public:avm/ptn/azd/aks:<version>' = {
         name: 'npuserpool'
         osType: 'Linux'
         type: 'VirtualMachineScaleSets'
-        vmSize: 'standard_a2'
+        vmSize: 'standard_a2_v2'
       }
     ]
     aksClusterRoleAssignmentName: '<aksClusterRoleAssignmentName>'
@@ -217,7 +222,7 @@ module aks 'br/public:avm/ptn/azd/aks:<version>' = {
           "name": "npuserpool",
           "osType": "Linux",
           "type": "VirtualMachineScaleSets",
-          "vmSize": "standard_a2"
+          "vmSize": "standard_a2_v2"
         }
       ]
     },
@@ -272,7 +277,7 @@ param agentPools = [
     name: 'npuserpool'
     osType: 'Linux'
     type: 'VirtualMachineScaleSets'
-    vmSize: 'standard_a2'
+    vmSize: 'standard_a2_v2'
   }
 ]
 param aksClusterRoleAssignmentName = '<aksClusterRoleAssignmentName>'
@@ -1036,9 +1041,9 @@ This section gives you an overview of all local-referenced module files (i.e., o
 
 | Reference | Type |
 | :-- | :-- |
-| `br/public:avm/res/container-registry/registry:0.4.0` | Remote reference |
+| `br/public:avm/res/container-registry/registry:0.5.1` | Remote reference |
 | `br/public:avm/res/container-service/managed-cluster:0.3.0` | Remote reference |
-| `br/public:avm/res/key-vault/vault:0.7.1` | Remote reference |
+| `br/public:avm/res/key-vault/vault:0.9.0` | Remote reference |
 
 ## Data Collection
 

diff --git a/avm/ptn/azd/aks/main.bicep b/avm/ptn/azd/aks/main.bicep
@@ -255,7 +255,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:0.3.0
   }
 }
 
-module containerRegistry 'br/public:avm/res/container-registry/registry:0.4.0' = {
+module containerRegistry 'br/public:avm/res/container-registry/registry:0.5.1' = {
   name: '${uniqueString(deployment().name, location)}-container-registry'
   params: {
     name: containerRegistryName
@@ -296,7 +296,7 @@ module containerRegistry 'br/public:avm/res/container-registry/registry:0.4.0' =
   }
 }
 
-module keyVault 'br/public:avm/res/key-vault/vault:0.7.1' = {
+module keyVault 'br/public:avm/res/key-vault/vault:0.9.0' = {
   name: '${uniqueString(deployment().name, location)}-key-vault'
   params: {
     name: keyVaultName

diff --git a/avm/ptn/azd/aks/main.json b/avm/ptn/azd/aks/main.json
diff --git a/avm/ptn/azd/aks/tests/e2e/defaults/main.test.bicep b/avm/ptn/azd/aks/tests/e2e/defaults/main.test.bicep
@@ -58,6 +58,7 @@ module testDeployment '../../../main.bicep' = [
       keyVaultName: 'kv${uniqueString(deployment().name)}-${serviceShort}'
       location: resourceLocation
       principalId: nestedDependencies.outputs.identityPrincipalId
+      principalType: 'ServicePrincipal'
     }
   }
 ]
diff --git a/avm/ptn/azd/aks/tests/e2e/max/main.test.bicep b/avm/ptn/azd/aks/tests/e2e/max/main.test.bicep
@@ -11,9 +11,6 @@ metadata description = 'This instance deploys the module with most of its featur
 @maxLength(90)
 param resourceGroupName string = 'dep-${namePrefix}-azd-aks-${serviceShort}-rg'
 
-@description('Optional. The location to deploy resources to.')
-param resourceLocation string = deployment().location
-
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
 param serviceShort string = 'paamax'
 
@@ -26,6 +23,10 @@ param containerRegistryRoleName string = newGuid()
 @description('Optional. The name (as GUID) of the role assignment. If not provided, a GUID will be generated.')
 param aksClusterRoleAssignmentName string = newGuid()
 
+// Enforced location als not all regions have quota available
+#disable-next-line no-hardcoded-location
+var enforcedLocation = 'northeurope'
+
 // ============ //
 // Dependencies //
 // ============ //
@@ -34,14 +35,14 @@ param aksClusterRoleAssignmentName string = newGuid()
 // =================
 resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
   name: resourceGroupName
-  location: resourceLocation
+  location: enforcedLocation
 }
 
 module nestedDependencies 'dependencies.bicep' = {
-  name: '${uniqueString(deployment().name, resourceLocation)}-test-dependencies'
+  name: '${uniqueString(deployment().name, enforcedLocation)}-test-dependencies'
   scope: resourceGroup
   params: {
-    location: resourceLocation
+    location: enforcedLocation
     appName: 'dep-${namePrefix}-app-${serviceShort}'
     appServicePlanName: 'dep-${namePrefix}-apps-${serviceShort}'
     logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
@@ -56,10 +57,10 @@ module nestedDependencies 'dependencies.bicep' = {
 module testDeployment '../../../main.bicep' = [
   for iteration in ['init', 'idem']: {
     scope: resourceGroup
-    name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
+    name: '${uniqueString(deployment().name, enforcedLocation)}-test-${serviceShort}-${iteration}'
     params: {
       name: 'mc${uniqueString(deployment().name)}-${serviceShort}'
-      containerRegistryName: '${uniqueString(deployment().name, resourceLocation)}testcontainerregistry${serviceShort}'
+      containerRegistryName: '${uniqueString(deployment().name, enforcedLocation)}testcontainerregistry${serviceShort}'
       skuTier: 'Free'
       webApplicationRoutingEnabled: true
       agentPools: [
@@ -70,12 +71,12 @@ module testDeployment '../../../main.bicep' = [
           maxPods: 30
           type: 'VirtualMachineScaleSets'
           maxSurge: '33%'
-          vmSize: 'standard_a2'
+          vmSize: 'standard_a2_v2'
         }
       ]
       logAnalyticsName: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId
       keyVaultName: 'kv${uniqueString(deployment().name)}-${serviceShort}'
-      location: resourceLocation
+      location: enforcedLocation
       principalId: nestedDependencies.outputs.identityPrincipalId
       acrSku: 'Basic'
       dnsPrefix: 'dep-${namePrefix}-dns-${serviceShort}'

diff --git a/avm/ptn/azd/ml-ai-environment/README.md b/avm/ptn/azd/ml-ai-environment/README.md
@@ -31,6 +31,7 @@ Create Azure Machine Learning workspaces of type 'Hub' and 'Project' and their r
 | `microsoft.insights/components/linkedStorageAccounts` | [2020-03-01-preview](https://learn.microsoft.com/en-us/azure/templates/microsoft.insights/2020-03-01-preview/components/linkedStorageAccounts) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 | `Microsoft.KeyVault/vaults` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults) |
+| `Microsoft.KeyVault/vaults/accessPolicies` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2023-07-01/vaults/accessPolicies) |
 | `Microsoft.KeyVault/vaults/accessPolicies` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/accessPolicies) |
 | `Microsoft.KeyVault/vaults/keys` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/keys) |
 | `Microsoft.KeyVault/vaults/secrets` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/secrets) |
@@ -95,7 +96,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
     // Required parameters
     cognitiveServicesName: 'maemincs001'
     hubName: 'maeminhub001'
-    keyVaultName: 'maeminkv00'
+    keyVaultName: 'maeminkv01'
     openAiConnectionName: 'maeminai001-connection'
     projectName: 'maeminpro001'
     searchConnectionName: 'maeminsearch001-connection'
@@ -127,7 +128,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
       "value": "maeminhub001"
     },
     "keyVaultName": {
-      "value": "maeminkv00"
+      "value": "maeminkv01"
     },
     "openAiConnectionName": {
       "value": "maeminai001-connection"
@@ -165,7 +166,7 @@ using 'br/public:avm/ptn/azd/ml-ai-environment:<version>'
 // Required parameters
 param cognitiveServicesName = 'maemincs001'
 param hubName = 'maeminhub001'
-param keyVaultName = 'maeminkv00'
+param keyVaultName = 'maeminkv01'
 param openAiConnectionName = 'maeminai001-connection'
 param projectName = 'maeminpro001'
 param searchConnectionName = 'maeminsearch001-connection'
@@ -194,7 +195,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
     // Required parameters
     cognitiveServicesName: 'maemaxcs001'
     hubName: 'maemaxhub001'
-    keyVaultName: 'maemaxkv001'
+    keyVaultName: 'maemaxkv002'
     openAiConnectionName: 'maemaxai001-connection'
     projectName: 'maemaxpro001'
     searchConnectionName: 'maemaxsearch001-connection'
@@ -244,7 +245,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
       "value": "maemaxhub001"
     },
     "keyVaultName": {
-      "value": "maemaxkv001"
+      "value": "maemaxkv002"
     },
     "openAiConnectionName": {
       "value": "maemaxai001-connection"
@@ -310,7 +311,7 @@ using 'br/public:avm/ptn/azd/ml-ai-environment:<version>'
 // Required parameters
 param cognitiveServicesName = 'maemaxcs001'
 param hubName = 'maemaxhub001'
-param keyVaultName = 'maemaxkv001'
+param keyVaultName = 'maemaxkv002'
 param openAiConnectionName = 'maemaxai001-connection'
 param projectName = 'maemaxpro001'
 param searchConnectionName = 'maemaxsearch001-connection'
@@ -537,7 +538,7 @@ This section gives you an overview of all local-referenced module files (i.e., o
 | Reference | Type |
 | :-- | :-- |
 | `br/public:avm/ptn/azd/ml-hub-dependencies:0.1.0` | Remote reference |
-| `br/public:avm/ptn/azd/ml-project:0.1.0` | Remote reference |
+| `br/public:avm/ptn/azd/ml-project:0.1.1` | Remote reference |
 | `br/public:avm/res/machine-learning-services/workspace:0.8.1` | Remote reference |
 
 ## Data Collection

diff --git a/avm/ptn/azd/ml-ai-environment/main.bicep b/avm/ptn/azd/ml-ai-environment/main.bicep
@@ -123,7 +123,7 @@ module hub './modules/hub.bicep' = {
   }
 }
 
-module project 'br/public:avm/ptn/azd/ml-project:0.1.0' = {
+module project 'br/public:avm/ptn/azd/ml-project:0.1.1' = {
   name: '${uniqueString(deployment().name, location)}-project'
   params: {
     name: projectName