Merge pull request #4205 from k8s-infra-cherrypick-robot/cherry-pick-…

…4191-to-release-1.11 [release-1.11] fix vnet in separate resource group
kubernetes-sigs · Oct 31, 2023 · 5f1830d · 5f1830d
2 parents 203a5b8 + 806dbde
commit 5f1830d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go
@@ -314,7 +314,7 @@ func (s *ClusterScope) RouteTableSpecs() []azure.ResourceSpecGetter {
 			specs = append(specs, &routetables.RouteTableSpec{
 				Name:           subnet.RouteTable.Name,
 				Location:       s.Location(),
-				ResourceGroup:  s.ResourceGroup(),
+				ResourceGroup:  s.Vnet().ResourceGroup,
 				ClusterName:    s.ClusterName(),
 				AdditionalTags: s.AdditionalTags(),
 			})
@@ -359,7 +359,7 @@ func (s *ClusterScope) NSGSpecs() []azure.ResourceSpecGetter {
 		nsgspecs[i] = &securitygroups.NSGSpec{
 			Name:                     subnet.SecurityGroup.Name,
 			SecurityRules:            subnet.SecurityGroup.SecurityRules,
-			ResourceGroup:            s.ResourceGroup(),
+			ResourceGroup:            s.Vnet().ResourceGroup,
 			Location:                 s.Location(),
 			ClusterName:              s.ClusterName(),
 			AdditionalTags:           s.AdditionalTags(),

diff --git a/azure/scope/cluster_test.go b/azure/scope/cluster_test.go
@@ -809,11 +809,13 @@ func TestRouteTableSpecs(t *testing.T) {
 				},
 				AzureCluster: &infrav1.AzureCluster{
 					Spec: infrav1.AzureClusterSpec{
-						ResourceGroup: "my-rg",
 						AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
 							Location: "centralIndia",
 						},
 						NetworkSpec: infrav1.NetworkSpec{
+							Vnet: infrav1.VnetSpec{
+								ResourceGroup: "my-rg",
+							},
 							Subnets: infrav1.Subnets{
 								{
 									RouteTable: infrav1.RouteTable{
@@ -1140,11 +1142,13 @@ func TestNSGSpecs(t *testing.T) {
 				},
 				AzureCluster: &infrav1.AzureCluster{
 					Spec: infrav1.AzureClusterSpec{
-						ResourceGroup: "my-rg",
 						AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
 							Location: "centralIndia",
 						},
 						NetworkSpec: infrav1.NetworkSpec{
+							Vnet: infrav1.VnetSpec{
+								ResourceGroup: "my-rg",
+							},
 							Subnets: infrav1.Subnets{
 								{
 									SecurityGroup: infrav1.SecurityGroup{

diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
diff --git a/templates/test/ci/prow-custom-vnet/patches/custom-vnet.yaml b/templates/test/ci/prow-custom-vnet/patches/custom-vnet.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   networkSpec:
     vnet:
-      resourceGroup: ${AZURE_RESOURCE_GROUP}
+      resourceGroup: ${AZURE_CUSTOM_VNET_RESOURCE_GROUP}
       name: ${AZURE_CUSTOM_VNET_NAME}
     subnets:
       - name: ${AZURE_CUSTOM_VNET_NAME}-controlplane-subnet

diff --git a/templates/test/ci/prow-private/patches/vnet-peerings.yaml b/templates/test/ci/prow-private/patches/vnet-peerings.yaml
@@ -15,7 +15,7 @@ spec:
       cidrBlocks:
       - ${AZURE_PRIVATE_VNET_CIDR}
       peerings:
-      - resourceGroup: ${AZURE_RESOURCE_GROUP}
+      - resourceGroup: ${AZURE_CUSTOM_VNET_RESOURCE_GROUP}
         remoteVnetName: ${AZURE_CUSTOM_VNET_NAME}
     subnets:
       - name: private-cp-subnet

diff --git a/test/e2e/azure_privatecluster.go b/test/e2e/azure_privatecluster.go
@@ -227,7 +227,7 @@ func SetupExistingVNet(ctx context.Context, vnetCidr string, cpSubnetCidrs, node
 	routetableClient.Authorizer = authorizer
 
 	By("creating a resource group")
-	groupName := os.Getenv(AzureResourceGroup)
+	groupName := os.Getenv(AzureCustomVnetResourceGroup)
 	_, err = groupClient.CreateOrUpdate(ctx, groupName, resources.Group{
 		Location: ptr.To(os.Getenv(AzureLocation)),
 		Tags: map[string]*string{

diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
@@ -135,6 +135,7 @@ var _ = Describe("Workload cluster creation", func() {
 		}
 		dumpSpecResourcesAndCleanup(ctx, cleanInput)
 		Expect(os.Unsetenv(AzureResourceGroup)).To(Succeed())
+		Expect(os.Unsetenv(AzureCustomVnetResourceGroup)).To(Succeed())
 		Expect(os.Unsetenv(AzureVNetName)).To(Succeed())
 		Expect(os.Unsetenv(ClusterIdentityName)).To(Succeed())
 		Expect(os.Unsetenv(ClusterIdentityNamespace)).To(Succeed())
@@ -155,6 +156,7 @@ var _ = Describe("Workload cluster creation", func() {
 				clusterName = getClusterName(clusterNamePrefix, "public-custom-vnet")
 				By("Creating a custom virtual network", func() {
 					Expect(os.Setenv(AzureCustomVNetName, "custom-vnet")).To(Succeed())
+					Expect(os.Setenv(AzureCustomVnetResourceGroup, clusterName+"-vnetrg")).To(Succeed())
 					additionalCleanup = SetupExistingVNet(ctx,
 						"10.0.0.0/16",
 						map[string]string{fmt.Sprintf("%s-controlplane-subnet", os.Getenv(AzureCustomVNetName)): "10.0.0.0/24"},

diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -58,6 +58,7 @@ const (
 	AzureExtendedLocationType       = "AZURE_EXTENDEDLOCATION_TYPE"
 	AzureExtendedLocationName       = "AZURE_EXTENDEDLOCATION_NAME"
 	AzureResourceGroup              = "AZURE_RESOURCE_GROUP"
+	AzureCustomVnetResourceGroup    = "AZURE_CUSTOM_VNET_RESOURCE_GROUP"
 	AzureVNetName                   = "AZURE_VNET_NAME"
 	AzureCustomVNetName             = "AZURE_CUSTOM_VNET_NAME"
 	AzureInternalLBIP               = "AZURE_INTERNAL_LB_IP"