Merge pull request #626 from microsoft/feature/41955-cleanup-unused-bicep-resources

feat: clean up unused Bicep resources (US #41955)

Author: Roopan-Microsoft

infra/main.bicep

@@ -211,7 +211,6 @@ var privateDnsZones = [
   'privatelink.queue.${environment().suffixes.storage}'
   'privatelink.api.azureml.ms'
   'privatelink.azconfig.io'
-  'privatelink.azurecr.io' // Todo: to be deleted
 ]
 // DNS Zone Index Constants
 var dnsZoneIndex = {
@@ -223,7 +222,6 @@ var dnsZoneIndex = {
   storageQueue: 5
   aiFoundry: 6
   appConfig: 7
-  containerRegistry: 8
 }
 @batchSize(5)
 module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.1' = [
@@ -737,8 +735,12 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
       corsRules: []
       deleteRetentionPolicyEnabled: false
       containers: [
+        // 'smemory' is the blob container consumed at runtime by Kernel Memory
+        // (KernelMemory:Services:AzureBlobs:Container in App Configuration). Pre-creating it here
+        // aligns infrastructure-as-code with actual runtime usage. Replaces the legacy 'data'
+        // container, which had no consumer in application code.
         {
-          name: 'data'
+          name: 'smemory'
           publicAccess: 'None'
         }
       ]

infra/main.json

@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.41.2.15936",
-      "templateHash": "9394084247445195271"
+      "version": "0.43.1.21952",
+      "templateHash": "16210311400744160873"
     }
   },
   "parameters": {
@@ -268,8 +268,7 @@
       "[format('privatelink.blob.{0}', environment().suffixes.storage)]",
       "[format('privatelink.queue.{0}', environment().suffixes.storage)]",
       "privatelink.api.azureml.ms",
-      "privatelink.azconfig.io",
-      "privatelink.azurecr.io"
+      "privatelink.azconfig.io"
     ],
     "dnsZoneIndex": {
       "cosmosDB": 0,
@@ -279,8 +278,7 @@
       "storageBlob": 4,
       "storageQueue": 5,
       "aiFoundry": 6,
-      "appConfig": 7,
-      "containerRegistry": 8
+      "appConfig": 7
     },
     "logAnalyticsWorkspaceResourceName": "[format('log-{0}', variables('solutionSuffix'))]",
     "bastionHostName": "[format('bas-{0}', variables('solutionSuffix'))]",
@@ -6885,8 +6883,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.41.2.15936",
-              "templateHash": "5508350408852137780"
+              "version": "0.43.1.21952",
+              "templateHash": "10615902090169258577"
             }
           },
           "definitions": {
@@ -7155,20 +7153,6 @@
                     "securityRules": []
                   }
                 },
-                {
-                  "name": "deployment-scripts",
-                  "addressPrefixes": [
-                    "10.0.4.0/24"
-                  ],
-                  "networkSecurityGroup": {
-                    "name": "nsg-deployment-scripts",
-                    "securityRules": []
-                  },
-                  "delegation": "Microsoft.ContainerInstance/containerGroups",
-                  "serviceEndpoints": [
-                    "Microsoft.Storage"
-                  ]
-                },
                 {
                   "name": "jumpbox",
                   "addressPrefixes": [
@@ -9705,10 +9689,6 @@
               "type": "string",
               "value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'AzureBastionSubnet'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'AzureBastionSubnet')], '')]"
             },
-            "deploymentScriptsSubnetResourceId": {
-              "type": "string",
-              "value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'deployment-scripts'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'deployment-scripts')], '')]"
-            },
             "jumpboxSubnetResourceId": {
               "type": "string",
               "value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'jumpbox'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'jumpbox')], '')]"
@@ -21098,8 +21078,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.41.2.15936",
-              "templateHash": "16957454238390913514"
+              "version": "0.43.1.21952",
+              "templateHash": "2328998422553242639"
             },
             "name": "Container Registry Module"
           },
@@ -35719,7 +35699,7 @@
               "deleteRetentionPolicyEnabled": false,
               "containers": [
                 {
-                  "name": "data",
+                  "name": "smemory",
                   "publicAccess": "None"
                 }
               ]
@@ -49125,8 +49105,8 @@
       },
       "dependsOn": [
         "avmOpenAi",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "virtualNetwork"
       ]
     },

infra/modules/virtualNetwork.bicep

@@ -83,16 +83,6 @@ param subnets subnetType[] = [
       securityRules: []
     }
   }
-  {
-    name: 'deployment-scripts'
-    addressPrefixes: ['10.0.4.0/24']
-    networkSecurityGroup: {
-      name: 'nsg-deployment-scripts'
-      securityRules: []
-      }
-    delegation: 'Microsoft.ContainerInstance/containerGroups'
-    serviceEndpoints: ['Microsoft.Storage']
-  }
   {
     name: 'jumpbox'
     addressPrefixes: ['10.0.12.0/23'] // /23 (10.0.12.0 - 10.0.13.255), 512 addresses
@@ -306,7 +296,6 @@ output subnets subnetOutputType[] = [
 output webSubnetResourceId string = contains(map(subnets, subnet => subnet.name), 'web') ? virtualNetwork.outputs.subnetResourceIds[indexOf(map(subnets, subnet => subnet.name), 'web')] : ''
 output pepsSubnetResourceId string = contains(map(subnets, subnet => subnet.name), 'peps') ? virtualNetwork.outputs.subnetResourceIds[indexOf(map(subnets, subnet => subnet.name), 'peps')] : ''
 output bastionSubnetResourceId string = contains(map(subnets, subnet => subnet.name), 'AzureBastionSubnet') ? virtualNetwork.outputs.subnetResourceIds[indexOf(map(subnets, subnet => subnet.name), 'AzureBastionSubnet')] : ''
-output deploymentScriptsSubnetResourceId string = contains(map(subnets, subnet => subnet.name), 'deployment-scripts') ? virtualNetwork.outputs.subnetResourceIds[indexOf(map(subnets, subnet => subnet.name), 'deployment-scripts')] : ''
 output jumpboxSubnetResourceId string = contains(map(subnets, subnet => subnet.name), 'jumpbox') ? virtualNetwork.outputs.subnetResourceIds[indexOf(map(subnets, subnet => subnet.name), 'jumpbox')] : ''
 
 @export()