From d50f4d1ed04d61550bf316d6e4e493ca472c819d Mon Sep 17 00:00:00 2001 From: bennerv <10840174+bennerv@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:48:38 -0400 Subject: [PATCH] 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. --- pkg/deploy/assets/cluster-development-predeploy.json | 4 +++- pkg/deploy/generator/resources_cluster.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/deploy/assets/cluster-development-predeploy.json b/pkg/deploy/assets/cluster-development-predeploy.json index 71c04a049ea..7cbc97a6bfb 100644 --- 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 index 3297fc92bc6..c60b5acc922 100644 --- 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'))]"), },