Release (#53)

* Fixing release.
Azure · Feb 20, 2024 · bdb4f1f · bdb4f1f
1 parent 5aa0731
commit bdb4f1f
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,18 +26,23 @@ jobs:
           environment: azurecloud
           allow-no-subscriptions: false
 
+      - name: Install Bicep
+        shell: pwsh
+        run: |
+          az config set bicep.use_binary_from_path=False
+          az bicep install   
+
+      - name: Bicep build
+        shell: pwsh
+        run: |
+          /home/runner/.azure/bin/bicep build bicep/main.bicep --outfile azuredeploy.json
+
       - name: Github Checkin
         uses: EndBug/add-and-commit@v9
         with:
           message: "Initialize Software Install"
           add: "."
 
-      - name: Build ARM Template
-        uses: Azure/[email protected]
-        with:
-          bicepFilePath: bicep/main.bicep
-          outputFilePath: azuredeploy.json
-
       - name: Bump version and push tag
         uses: anothrNick/[email protected]
         env:

diff --git a/azuredeploy.json b/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.25.53.49325",
-      "templateHash": "2807170886321959755"
+      "templateHash": "3026879615332679589"
     }
   },
   "parameters": {
@@ -2438,7 +2438,28 @@
             "value": "[variables('enableVnetInjection')]"
           },
           "vnetConfiguration": {
-            "value": "[parameters('vnetConfiguration')]"
+            "value": {
+              "group": "[parameters('vnetConfiguration').group]",
+              "name": "[parameters('vnetConfiguration').name]",
+              "prefix": "[parameters('vnetConfiguration').prefix]",
+              "identityId": "[parameters('vnetConfiguration').identityId]",
+              "aksSubnet": {
+                "name": "[parameters('vnetConfiguration').aksSubnet.name]",
+                "prefix": "[parameters('vnetConfiguration').aksSubnet.prefix]"
+              },
+              "podSubnet": {
+                "name": "[parameters('vnetConfiguration').podSubnet.name]",
+                "prefix": "[parameters('vnetConfiguration').podSubnet.prefix]"
+              },
+              "bastionSubnet": {
+                "name": "[parameters('vnetConfiguration').bastionSubnet.name]",
+                "prefix": "[parameters('vnetConfiguration').bastionSubnet.prefix]"
+              },
+              "vmSubnet": {
+                "name": "[parameters('vnetConfiguration').vmSubnet.name]",
+                "prefix": "[parameters('vnetConfiguration').vmSubnet.prefix]"
+              }
+            }
           }
         },
         "template": {

diff --git a/bicep/main.bicep b/bicep/main.bicep
@@ -198,7 +198,28 @@ module networkBlade 'modules/blade_network.bicep' = {
     enablePodSubnet: enablePodSubnet
     enableVnetInjection: enableVnetInjection
 
-    vnetConfiguration: vnetConfiguration
+    vnetConfiguration: {
+      group: vnetConfiguration.group
+      name: vnetConfiguration.name
+      prefix: vnetConfiguration.prefix
+      identityId: vnetConfiguration.identityId
+      aksSubnet: {
+        name: vnetConfiguration.aksSubnet.name
+        prefix: vnetConfiguration.aksSubnet.prefix
+      }
+      podSubnet: {
+        name: vnetConfiguration.podSubnet.name
+        prefix: vnetConfiguration.podSubnet.prefix
+      }
+      bastionSubnet: {
+        name: vnetConfiguration.bastionSubnet.name
+        prefix: vnetConfiguration.bastionSubnet.prefix
+      }
+      vmSubnet: {
+        name: vnetConfiguration.vmSubnet.name
+        prefix: vnetConfiguration.vmSubnet.prefix
+      }
+    }
   }
   dependsOn: [
     stampIdentity

diff --git a/bicep/modules/blade_service.bicep b/bicep/modules/blade_service.bicep
@@ -83,7 +83,6 @@ param identityId string
 @description('The name of the partition storage accounts')
 param partitionStorageNames string[]
 
-
 @description('Feature Flag to Load Software.')
 param enableSoftwareLoad bool