Merge pull request #9603 from patrickdillon/ocpbugs-54232-vnet-rg

OCPBUGS-54232:  Azure Move BYO VNET SG creation to InfraReady

Author: openshift-merge-bot[bot]

pkg/infrastructure/azure/azure.go

@@ -55,7 +55,6 @@ type Provider struct {
 	Tags                  map[string]*string
 }
 
-var _ clusterapi.PreProvider = (*Provider)(nil)
 var _ clusterapi.InfraReadyProvider = (*Provider)(nil)
 var _ clusterapi.PostProvider = (*Provider)(nil)
 var _ clusterapi.IgnitionProvider = (*Provider)(nil)
@@ -83,8 +82,8 @@ func (p Provider) ProvisionTimeout() time.Duration {
 // in the status and should use the API load balancer when gathering bootstrap log bundles.
 func (*Provider) PublicGatherEndpoint() clusterapi.GatherEndpoint { return clusterapi.APILoadBalancer }
 
-// PreProvision is called before provisioning using CAPI controllers has begun.
-func (p *Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
+// InfraReady is called once the installer infrastructure is ready.
+func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput) error {
 	session, err := in.InstallConfig.Azure.Session()
 	if err != nil {
 		return fmt.Errorf("failed to get session: %w", err)
@@ -127,7 +126,7 @@ func (p *Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionI
 			securityGroupName,
 			armnetwork.SecurityGroup{
 				Location: to.Ptr(platform.Region),
-				Tags:     tags,
+				Tags:     p.Tags,
 			},
 			nil)
 		if err != nil {
@@ -140,21 +139,6 @@ func (p *Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionI
 		logrus.Infof("nsg=%s", *nsg.ID)
 	}
 
-	return nil
-}
-
-// InfraReady is called once the installer infrastructure is ready.
-func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput) error {
-	session, err := in.InstallConfig.Azure.Session()
-	if err != nil {
-		return fmt.Errorf("failed to get session: %w", err)
-	}
-
-	installConfig := in.InstallConfig.Config
-	platform := installConfig.Platform.Azure
-	subscriptionID := session.Credentials.SubscriptionID
-	cloudConfiguration := session.CloudConfig
-
 	var architecture armcompute.Architecture
 	if installConfig.ControlPlane.Architecture == types.ArchitectureARM64 {
 		architecture = armcompute.ArchitectureArm64
@@ -199,14 +183,6 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
 		return fmt.Errorf("image length is not aligned on a 512 byte boundary")
 	}
 
-	userTags := platform.UserTags
-	tags := make(map[string]*string, len(userTags)+1)
-	tags[fmt.Sprintf("kubernetes.io_cluster.%s", in.InfraID)] = ptr.To("owned")
-	for k, v := range userTags {
-		tags[k] = ptr.To(v)
-	}
-
-	tokenCredential := session.TokenCreds
 	storageURL := fmt.Sprintf("https://%s.blob.%s", storageAccountName, session.Environment.StorageEndpointSuffix)
 	blobURL := fmt.Sprintf("%s/%s/%s", storageURL, containerName, blobName)