Replace bastion env var with function parameter

kubernetes-sigs · Oct 11, 2021 · b82be8c · b82be8c
1 parent 9f4ce9a
commit b82be8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/test/e2e/azure_privatecluster.go b/test/e2e/azure_privatecluster.go
@@ -1,4 +1,3 @@
-//go:build e2e
 // +build e2e
 
 /*
@@ -224,7 +223,7 @@ func AzurePrivateClusterSpec(ctx context.Context, inputGetter func() AzurePrivat
 }
 
 // SetupExistingVNet creates a resource group and a VNet to be used by a workload cluster.
-func SetupExistingVNet(ctx context.Context, vnetCidr string, cpSubnetCidrs, nodeSubnetCidrs map[string]string) func() {
+func SetupExistingVNet(ctx context.Context, vnetCidr string, cpSubnetCidrs, nodeSubnetCidrs map[string]string, bastionSubnetName, bastionSubnetCidr string) func() {
 	By("creating Azure clients with the workload cluster's subscription")
 	settings, err := auth.GetSettingsFromEnvironment()
 	Expect(err).NotTo(HaveOccurred())
@@ -348,9 +347,9 @@ func SetupExistingVNet(ctx context.Context, vnetCidr string, cpSubnetCidrs, node
 	// Create the AzureBastion subnet.
 	subnets = append(subnets, network.Subnet{
 		SubnetPropertiesFormat: &network.SubnetPropertiesFormat{
-			AddressPrefix: pointer.StringPtr("10.0.2.0/24"),
+			AddressPrefix: pointer.StringPtr(bastionSubnetCidr),
 		},
-		Name: pointer.StringPtr(fmt.Sprintf("%s-azure-bastion-subnet", os.Getenv(AzureCustomVNetName))),
+		Name: pointer.StringPtr(bastionSubnetName),
 	})
 
 	vnetFuture, err := vnetClient.CreateOrUpdate(ctx, groupName, os.Getenv(AzureCustomVNetName), network.VirtualNetwork{

diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
@@ -145,7 +145,10 @@ var _ = Describe("Workload cluster creation", func() {
 					additionalCleanup = SetupExistingVNet(ctx,
 						"10.0.0.0/16",
 						map[string]string{fmt.Sprintf("%s-controlplane-subnet", os.Getenv(AzureCustomVNetName)): "10.0.0.0/24"},
-						map[string]string{fmt.Sprintf("%s-node-subnet", os.Getenv(AzureCustomVNetName)): "10.0.1.0/24"})
+						map[string]string{fmt.Sprintf("%s-node-subnet", os.Getenv(AzureCustomVNetName)): "10.0.1.0/24"},
+						fmt.Sprintf("%s-azure-bastion-subnet", os.Getenv(AzureCustomVNetName)),
+						"10.0.2.0/24",
+					)
 				})
 
 				clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{

diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -54,8 +54,6 @@ const (
 	AzureCPSubnetCidr              = "AZURE_CP_SUBNET_CIDR"
 	AzureVNetCidr                  = "AZURE_PRIVATE_VNET_CIDR"
 	AzureNodeSubnetCidr            = "AZURE_NODE_SUBNET_CIDR"
-	AzureBastionSubnetCIDR         = "AZURE_BASTION_SUBNET_CIDR"
-	AzureBastionSubnetName         = "AZURE_BASTION_SUBNET_NAME"
 	MultiTenancyIdentityName       = "MULTI_TENANCY_IDENTITY_NAME"
 	ClusterIdentityName            = "CLUSTER_IDENTITY_NAME"
 	ClusterIdentityNamespace       = "CLUSTER_IDENTITY_NAMESPACE"