Updated the software and made it override capable.

Azure · Jan 17, 2024 · 3796477 · 3796477
1 parent 84a0fd2
commit 3796477
Show file tree

Hide file tree

Showing 2 changed files with 201 additions and 181 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "8345717965934980829"
+      "templateHash": "16869636000797096972"
     }
   },
   "parameters": {
@@ -23,79 +23,92 @@
         "description": "Feature Flag to Enable Telemetry"
       }
     },
-    "enablePodSubnet": {
-      "type": "bool",
-      "defaultValue": false,
+    "applicationClientId": {
+      "type": "string",
       "metadata": {
-        "description": "Feature Flag to Enable a Pod Subnet"
+        "description": "Specify the AD Application Client Id."
       }
     },
-    "virtualNetworkNewOrExisting": {
+    "clusterIngress": {
       "type": "string",
-      "defaultValue": "new",
+      "defaultValue": "Both",
+      "allowedValues": [
+        "Internal",
+        "External",
+        "Both"
+      ],
       "metadata": {
-        "description": "Boolean indicating whether the VNet is new or existing"
+        "description": "The Cluster Ingress Mode"
       }
     },
-    "virtualNetworkName": {
-      "type": "string",
-      "defaultValue": "osdu-network",
+    "partitions": {
+      "type": "array",
+      "defaultValue": [
+        {
+          "name": "opendes"
+        }
+      ],
       "metadata": {
-        "description": "Name of the Virtual Network (Optional: If exiting Network is selected)"
+        "description": "List of Data Partitions"
       }
     },
-    "virtualNetworkResourceGroup": {
+    "clusterSize": {
       "type": "string",
-      "defaultValue": "osdu-network",
+      "defaultValue": "CostOptimised",
+      "allowedValues": [
+        "CostOptimised",
+        "Standard",
+        "HighSpec"
+      ],
       "metadata": {
-        "description": "Resource group of the VNet (Optional: If exiting Network is selected)"
+        "description": "The Cluster Size"
       }
     },
-    "virtualNetworkAddressPrefix": {
+    "softwareRepository": {
       "type": "string",
-      "defaultValue": "10.1.0.0/16",
+      "defaultValue": "https://github.com/azure/osdu-developer",
       "metadata": {
-        "description": "VNet address prefix"
+        "description": "Software GIT Repository URL"
       }
     },
-    "aksSubnetName": {
+    "softwareBranch": {
       "type": "string",
-      "defaultValue": "ClusterSubnet",
+      "defaultValue": "main",
       "metadata": {
-        "description": "New or Existing subnet Name"
+        "description": "Software GIT Repository Branch"
       }
     },
-    "aksSubnetAddressPrefix": {
-      "type": "string",
-      "defaultValue": "10.1.0.0/20",
+    "enableBastion": {
+      "type": "bool",
+      "defaultValue": false,
       "metadata": {
-        "description": "Subnet address prefix"
+        "description": "Feature Flag to Enable Bastion"
       }
     },
-    "bastionSubnetName": {
+    "vmAdminUsername": {
       "type": "string",
-      "defaultValue": "AzureBastionSubnet",
+      "defaultValue": "[if(parameters('enableBastion'), 'azureUser', newGuid())]",
       "metadata": {
-        "description": "New or Existing subnet Name"
+        "description": "Specifies the name of the administrator account of the virtual machine."
       }
     },
-    "bastionSubnetAddressPrefix": {
-      "type": "string",
-      "defaultValue": "10.1.16.0/24",
+    "vmAdminPasswordOrKey": {
+      "type": "securestring",
+      "defaultValue": "[if(parameters('enableBastion'), '', newGuid())]",
       "metadata": {
-        "description": "Specifies the Bastion subnet IP prefix. This prefix must be within vnet IP prefix address space."
+        "description": "Specifies the SSH Key or password for the virtual machine. SSH key is recommended."
       }
     },
-    "gatewaySubnetName": {
+    "bastionSubnetName": {
       "type": "string",
-      "defaultValue": "GatewaySubnet",
+      "defaultValue": "AzureBastionSubnet",
       "metadata": {
         "description": "New or Existing subnet Name"
       }
     },
-    "gatewaySubnetAddressPrefix": {
+    "bastionSubnetAddressPrefix": {
       "type": "string",
-      "defaultValue": "10.1.17.0/24",
+      "defaultValue": "10.1.16.0/24",
       "metadata": {
         "description": "Specifies the Bastion subnet IP prefix. This prefix must be within vnet IP prefix address space."
       }
@@ -114,20 +127,6 @@
         "description": "Specifies the address prefix of the subnet which contains the virtual machine."
       }
     },
-    "podSubnetName": {
-      "type": "string",
-      "defaultValue": "PodSubnet",
-      "metadata": {
-        "description": "New or Existing subnet Name"
-      }
-    },
-    "podSubnetAddressPrefix": {
-      "type": "string",
-      "defaultValue": "10.1.19.0/20",
-      "metadata": {
-        "description": "Subnet address prefix"
-      }
-    },
     "enableVpnGateway": {
       "type": "bool",
       "defaultValue": false,
@@ -156,91 +155,106 @@
         "description": "IP Address Segment of the Remote Network"
       }
     },
-    "enablePrivateLink": {
+    "gatewaySubnetName": {
+      "type": "string",
+      "defaultValue": "GatewaySubnet",
+      "metadata": {
+        "description": "New or Existing subnet Name"
+      }
+    },
+    "gatewaySubnetAddressPrefix": {
+      "type": "string",
+      "defaultValue": "10.1.17.0/24",
+      "metadata": {
+        "description": "Specifies the Bastion subnet IP prefix. This prefix must be within vnet IP prefix address space."
+      }
+    },
+    "enablePodSubnet": {
       "type": "bool",
       "defaultValue": false,
       "metadata": {
-        "description": "Feature Flag to Enable Private Link"
+        "description": "Feature Flag to Enable a Pod Subnet"
       }
     },
-    "cmekConfiguration": {
-      "type": "object",
-      "defaultValue": {
-        "kvUrl": "",
-        "keyName": "",
-        "identityId": ""
-      },
+    "podSubnetName": {
+      "type": "string",
+      "defaultValue": "PodSubnet",
       "metadata": {
-        "description": "Optional. Customer Managed Encryption Key."
+        "description": "New or Existing subnet Name"
       }
     },
-    "applicationClientId": {
+    "podSubnetAddressPrefix": {
       "type": "string",
+      "defaultValue": "10.1.19.0/20",
       "metadata": {
-        "description": "Specify the AD Application Client Id."
+        "description": "Subnet address prefix"
       }
     },
-    "partitions": {
-      "type": "array",
-      "defaultValue": [
-        {
-          "name": "opendes"
-        }
-      ],
+    "virtualNetworkNewOrExisting": {
+      "type": "string",
+      "defaultValue": "new",
       "metadata": {
-        "description": "List of Data Partitions"
+        "description": "Boolean indicating whether the VNet is new or existing"
       }
     },
-    "clusterSize": {
+    "virtualNetworkName": {
       "type": "string",
-      "defaultValue": "CostOptimised",
-      "allowedValues": [
-        "CostOptimised",
-        "Standard",
-        "HighSpec"
-      ],
+      "defaultValue": "osdu-network",
       "metadata": {
-        "description": "The Cluster Size"
+        "description": "Name of the Virtual Network (Optional: If exiting Network is selected)"
       }
     },
-    "clusterIngress": {
+    "virtualNetworkResourceGroup": {
       "type": "string",
-      "defaultValue": "Both",
-      "allowedValues": [
-        "Internal",
-        "External",
-        "Both"
-      ],
+      "defaultValue": "osdu-network",
       "metadata": {
-        "description": "The Cluster Ingress Mode"
+        "description": "Resource group of the VNet (Optional: If exiting Network is selected)"
       }
     },
-    "clusterAdminIds": {
-      "type": "array",
-      "defaultValue": [],
+    "virtualNetworkAddressPrefix": {
+      "type": "string",
+      "defaultValue": "10.1.0.0/16",
       "metadata": {
-        "description": "Optional: Specify the AD Users and/or Groups that can manage the cluster."
+        "description": "VNet address prefix"
       }
     },
-    "enableBastion": {
+    "aksSubnetName": {
+      "type": "string",
+      "defaultValue": "ClusterSubnet",
+      "metadata": {
+        "description": "New or Existing subnet Name"
+      }
+    },
+    "aksSubnetAddressPrefix": {
+      "type": "string",
+      "defaultValue": "10.1.0.0/20",
+      "metadata": {
+        "description": "Subnet address prefix"
+      }
+    },
+    "enablePrivateLink": {
       "type": "bool",
       "defaultValue": false,
       "metadata": {
-        "description": "Feature Flag to Enable Bastion"
+        "description": "Feature Flag to Enable Private Link"
       }
     },
-    "vmAdminUsername": {
-      "type": "string",
-      "defaultValue": "[if(parameters('enableBastion'), 'azureUser', newGuid())]",
+    "cmekConfiguration": {
+      "type": "object",
+      "defaultValue": {
+        "kvUrl": "",
+        "keyName": "",
+        "identityId": ""
+      },
       "metadata": {
-        "description": "Specifies the name of the administrator account of the virtual machine."
+        "description": "Optional. Customer Managed Encryption Key."
       }
     },
-    "vmAdminPasswordOrKey": {
-      "type": "securestring",
-      "defaultValue": "[if(parameters('enableBastion'), '', newGuid())]",
+    "clusterAdminIds": {
+      "type": "array",
+      "defaultValue": [],
       "metadata": {
-        "description": "Specifies the SSH Key or password for the virtual machine. SSH key is recommended."
+        "description": "Optional: Specify the AD Users and/or Groups that can manage the cluster."
       }
     }
   },
@@ -664,8 +678,8 @@
       },
       "gitops": {
         "name": "flux-system",
-        "url": "https://github.com/azure/osdu-developer",
-        "branch": "aks_update",
+        "url": "[parameters('softwareRepository')]",
+        "branch": "[parameters('softwareBranch')]",
         "components": "./stamp/components",
         "applications": "./stamp/applications"
       },
@@ -698,13 +712,13 @@
   "resources": [
     {
       "type": "Microsoft.Network/virtualWans",
-      "apiVersion": "2023-04-01",
+      "apiVersion": "2023-06-01",
       "name": "[format('{0}-wan', variables('commonLayerConfig').network.name)]",
       "location": "[parameters('location')]"
     },
     {
       "type": "Microsoft.Network/virtualHubs",
-      "apiVersion": "2022-01-01",
+      "apiVersion": "2023-06-01",
       "name": "[format('{0}-hub', variables('commonLayerConfig').network.name)]",
       "location": "[parameters('location')]",
       "properties": {