Merge pull request #1120 from flavianmissi/OCPBUGS-42196

OCPBUGS-42196: pkg/storage/azure: use cluster-api tag key to discover vnet

Author: openshift-merge-bot[bot]

pkg/storage/azure/azure.go

@@ -676,8 +676,13 @@ func (d *driver) assurePrivateAccount(cfg *Azure, infra *configv1.Infrastructure
 	}
 
 	if internalConfig.VNetName == "" {
+		upstreamTagKey := fmt.Sprintf("sigs.k8s.io_cluster-api-provider-azure_cluster_%s", infra.Status.InfrastructureName)
 		tagKey := fmt.Sprintf("kubernetes.io_cluster.%s", infra.Status.InfrastructureName)
-		vnet, err := azclient.GetVNetByTag(d.Context, networkResourceGroup, tagKey, "owned", "shared")
+		tagFilter := map[string][]string{
+			upstreamTagKey: {"owned", "shared"},
+			tagKey:         {"owned", "shared"},
+		}
+		vnet, err := azclient.GetVNetByTags(d.Context, networkResourceGroup, tagFilter)
 		if err != nil {
 			return "", fmt.Errorf("failed to discover vnet name, please provide network details manually: %q", err)
 		}

pkg/storage/azure/azureclient/azureclient.go

@@ -150,7 +150,22 @@ func (c *Client) getStorageAccount(ctx context.Context, resourceGroupName, accou
 	return resp.Account, nil
 }
 
-func (c *Client) GetVNetByTag(ctx context.Context, resourceGroupName, tagKey string, tagValues ...string) (armnetwork.VirtualNetwork, error) {
+func (c *Client) vnetHasAnyTag(vnet armnetwork.VirtualNetwork, tagFilter map[string][]string) bool {
+	for tagKey, tagValues := range tagFilter {
+		tag, ok := vnet.Tags[tagKey]
+		if !ok {
+			continue
+		}
+		for _, tagValue := range tagValues {
+			if *tag == tagValue {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func (c *Client) GetVNetByTags(ctx context.Context, resourceGroupName string, tagFilter map[string][]string) (armnetwork.VirtualNetwork, error) {
 	client, err := armnetwork.NewVirtualNetworksClient(c.subscriptionID, c.creds, &arm.ClientOptions{
 		ClientOptions: *c.clientOpts,
 	})
@@ -165,19 +180,13 @@ func (c *Client) GetVNetByTag(ctx context.Context, resourceGroupName, tagKey str
 			return armnetwork.VirtualNetwork{}, err
 		}
 		for _, vnet := range page.Value {
-			tag, ok := vnet.Tags[tagKey]
-			if !ok {
-				continue
-			}
-			for _, tagValue := range tagValues {
-				if *tag == tagValue {
-					return *vnet, nil
-				}
+			if c.vnetHasAnyTag(*vnet, tagFilter) {
+				return *vnet, nil
 			}
 		}
 	}
 
-	return armnetwork.VirtualNetwork{}, fmt.Errorf("vnet with tag '%s: %v' not found", tagKey, tagValues)
+	return armnetwork.VirtualNetwork{}, fmt.Errorf("vnet with tags '%+v' not found", tagFilter)
 }
 
 func (c *Client) GetSubnetsByVNet(ctx context.Context, resourceGroupName, vnetName string) (armnetwork.Subnet, error) {