fix: subnet update issue when vnetResourceGroup is specified

k8s-infra-cherrypick-robot · Aug 1, 2024 · 571b789 · 571b789
1 parent 5c2a650
commit 571b789
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/pkg/provider/azure_loadbalancer.go b/pkg/provider/azure_loadbalancer.go
@@ -2324,7 +2324,7 @@ func (az *Cloud) reconcileFrontendIPConfigs(clusterName string,
 			if subnetName == nil {
 				subnetName = &az.SubnetName
 			}
-			subnet, existsSubnet, err = az.getSubnet(az.VnetName, *subnetName)
+			subnet, existsSubnet, err = az.getSubnet("", az.VnetName, *subnetName)
 			if err != nil {
 				return nil, toDeleteConfigs, false, err
 			}

diff --git a/pkg/provider/azure_privatelinkservice.go b/pkg/provider/azure_privatelinkservice.go
@@ -199,7 +199,7 @@ func (az *Cloud) disablePLSNetworkPolicy(service *v1.Service) error {
 		subnetName = &az.SubnetName
 	}
 
-	subnet, existsSubnet, err := az.getSubnet(az.VnetName, *subnetName)
+	subnet, existsSubnet, err := az.getSubnet("", az.VnetName, *subnetName)
 	if err != nil {
 		return err
 	}
@@ -352,7 +352,7 @@ func (az *Cloud) reconcilePLSIpConfigs(
 	if subnetName == nil {
 		subnetName = &az.SubnetName
 	}
-	subnet, existsSubnet, err := az.getSubnet(az.VnetName, *subnetName)
+	subnet, existsSubnet, err := az.getSubnet("", az.VnetName, *subnetName)
 	if err != nil {
 		return false, err
 	}

diff --git a/pkg/provider/azure_storageaccount.go b/pkg/provider/azure_storageaccount.go
@@ -598,7 +598,7 @@ func (az *Cloud) EnsureStorageAccount(ctx context.Context, accountOptions *Accou
 func (az *Cloud) createPrivateEndpoint(ctx context.Context, accountName string, accountID *string, privateEndpointName, vnetResourceGroup, vnetName, subnetName, location string, storageType StorageType) error {
 	klog.V(2).Infof("Creating private endpoint(%s) for account (%s)", privateEndpointName, accountName)
 
-	subnet, _, err := az.getSubnet(vnetName, subnetName)
+	subnet, _, err := az.getSubnet(vnetResourceGroup, vnetName, subnetName)
 	if err != nil {
 		return err
 	}
@@ -608,6 +608,7 @@ func (az *Cloud) createPrivateEndpoint(ctx context.Context, accountName string,
 		// Disable the private endpoint network policies before creating private endpoint
 		subnet.SubnetPropertiesFormat.PrivateEndpointNetworkPolicies = network.VirtualNetworkPrivateEndpointNetworkPoliciesDisabled
 	}
+
 	if rerr := az.SubnetsClient.CreateOrUpdate(ctx, vnetResourceGroup, vnetName, subnetName, subnet); rerr != nil {
 		return rerr.Error()
 	}

diff --git a/pkg/provider/azure_subnet_repo.go b/pkg/provider/azure_subnet_repo.go
@@ -45,17 +45,18 @@ func (az *Cloud) CreateOrUpdateSubnet(service *v1.Service, subnet network.Subnet
 	return nil
 }
 
-func (az *Cloud) getSubnet(virtualNetworkName string, subnetName string) (network.Subnet, bool, error) {
-	var rg string
-	if len(az.VnetResourceGroup) > 0 {
-		rg = az.VnetResourceGroup
-	} else {
-		rg = az.ResourceGroup
+func (az *Cloud) getSubnet(vnetResourceGroup, virtualNetworkName, subnetName string) (network.Subnet, bool, error) {
+	if vnetResourceGroup == "" {
+		if len(az.VnetResourceGroup) > 0 {
+			vnetResourceGroup = az.VnetResourceGroup
+		} else {
+			vnetResourceGroup = az.ResourceGroup
+		}
 	}
 
 	ctx, cancel := getContextWithCancel()
 	defer cancel()
-	subnet, err := az.SubnetsClient.Get(ctx, rg, virtualNetworkName, subnetName, "")
+	subnet, err := az.SubnetsClient.Get(ctx, vnetResourceGroup, virtualNetworkName, subnetName, "")
 	exists, rerr := checkResourceExistsFromError(err)
 	if rerr != nil {
 		return subnet, false, rerr.Error()