Use a mix of addressPrefix and addressPrefixes in e2e

This should allow us to catch any issues with using one over the other, since both are valid configurations on both vnets and subnets in Azure.
Azure · Sep 11, 2023 · c4cf22a · c4cf22a
1 parent 8afd0b2
commit c4cf22a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/deploy/assets/cluster-development-predeploy.json b/pkg/deploy/assets/cluster-development-predeploy.json
@@ -58,7 +58,9 @@
         },
         {
             "properties": {
-                "addressPrefix": "[parameters('masterAddressPrefix')]",
+                "addressPrefixes": [
+                    "[parameters('masterAddressPrefix')]"
+                ],
                 "routeTable": {
                     "id": "[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]",
                     "tags": null

diff --git a/pkg/deploy/generator/resources_cluster.go b/pkg/deploy/generator/resources_cluster.go
@@ -44,7 +44,9 @@ func (g *generator) clusterMasterSubnet() *arm.Resource {
 	return &arm.Resource{
 		Resource: &mgmtnetwork.Subnet{
 			SubnetPropertiesFormat: &mgmtnetwork.SubnetPropertiesFormat{
-				AddressPrefix: to.StringPtr("[parameters('masterAddressPrefix')]"),
+				AddressPrefixes: &[]string{
+					*to.StringPtr("[parameters('masterAddressPrefix')]"),
+				},
 				RouteTable: &mgmtnetwork.RouteTable{
 					ID: to.StringPtr("[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]"),
 				},