Azure: Testing

openshift · Mar 29, 2024 · 074cc46 · 074cc46
1 parent 177cc2f
commit 074cc46
Showing 1 changed file with 77 additions and 29 deletions.
diff --git a/pkg/infrastructure/azure/azure.go b/pkg/infrastructure/azure/azure.go
@@ -117,12 +117,12 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
 	platform := installConfig.Platform.Azure
 	subscriptionID := session.Credentials.SubscriptionID
 	cloudConfiguration := session.CloudConfig
-	clusterDomain := in.InstallConfig.Config.ClusterDomain()
-	clusterName := in.InstallConfig.Config.ObjectMeta.Name
-	baseDomain := in.InstallConfig.Config.BaseDomain
+	//clusterDomain := in.InstallConfig.Config.ClusterDomain()
+	//clusterName := in.InstallConfig.Config.ObjectMeta.Name
+	//baseDomain := in.InstallConfig.Config.BaseDomain
 
 	resourceGroupName := p.ResourceGroupName
-	baseDomainResourceGroupName := in.InstallConfig.Config.Azure.BaseDomainResourceGroupName
+	//baseDomainResourceGroupName := in.InstallConfig.Config.Azure.BaseDomainResourceGroupName
 	storageAccountName := fmt.Sprintf("cluster%s", randomString(5))
 	containerName := "vhd"
 	blobName := fmt.Sprintf("rhcos%s.vhd", randomString(5))
@@ -170,33 +170,41 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
 	storageURL := fmt.Sprintf("https://%s.blob.core.windows.net", storageAccountName)
 	blobURL := fmt.Sprintf("%s/%s/%s", storageURL, containerName, blobName)
 
-	useIPv6 := false
-	for _, network := range in.InstallConfig.Config.Networking.ServiceNetwork {
-		if network.IP.To4() == nil {
-			useIPv6 = true
-		}
-	}
-
-	// Create DNS entries
-	err = CreateDNSEntries(ctx, &CreateDNSEntriesInput{
-		SubscriptionID:              subscriptionID,
-		ResourceGroupName:           resourceGroupName,
-		BaseDomainResourceGroupName: baseDomainResourceGroupName,
-		BaseDomain:                  baseDomain,
-		ClusterDomain:               clusterDomain,
-		ClusterName:                 clusterName,
-		Region:                      platform.Region,
-		InfraID:                     in.InfraID,
-		Private:                     in.InstallConfig.Config.Publish == types.InternalPublishingStrategy,
-		UseIPv6:                     useIPv6,
-		Tags:                        tags,
-		CloudName:                   platform.CloudName,
-		TokenCredential:             tokenCredential,
-		CloudConfiguration:          cloudConfiguration,
-	})
+	err = createDNSEntries(ctx, in)
 	if err != nil {
 		log.Fatalf("failed to create DNS entries: %v", err)
 	}
+	/*
+		useIPv6 := false
+		for _, network := range in.InstallConfig.Config.Networking.ServiceNetwork {
+			if network.IP.To4() == nil {
+				useIPv6 = true
+			}
+		}
+	*/
+
+	// Create DNS entries
+	/*
+		err = CreateDNSEntries(ctx, &CreateDNSEntriesInput{
+			SubscriptionID:              subscriptionID,
+			ResourceGroupName:           resourceGroupName,
+			BaseDomainResourceGroupName: baseDomainResourceGroupName,
+			BaseDomain:                  baseDomain,
+			ClusterDomain:               clusterDomain,
+			ClusterName:                 clusterName,
+			Region:                      platform.Region,
+			InfraID:                     in.InfraID,
+			Private:                     in.InstallConfig.Config.Publish == types.InternalPublishingStrategy,
+			UseIPv6:                     useIPv6,
+			Tags:                        tags,
+			CloudName:                   platform.CloudName,
+			TokenCredential:             tokenCredential,
+			CloudConfiguration:          cloudConfiguration,
+		})
+		if err != nil {
+			log.Fatalf("failed to create DNS entries: %v", err)
+		}
+	*/
 
 	// Create user assigned identity
 	userAssignedIdentityName := fmt.Sprintf("%s-identity", in.InfraID)
@@ -435,7 +443,7 @@ func (p Provider) Ignition(ctx context.Context, in clusterapi.IgnitionInput) ([]
 
 // PostProvision provisions an external Load Balancer (when appropriate), and adds configuration
 // for the MCS to the CAPI-provisioned internal LB.
-func (*Provider) PostProvision(ctx context.Context, in clusterapi.PostProvisionInput) error {
+func (p *Provider) PostProvision(ctx context.Context, in clusterapi.PostProvisionInput) error {
 	ssn, err := in.InstallConfig.Azure.Session()
 	if err != nil {
 		return fmt.Errorf("error retrieving Azure session: %w", err)
@@ -510,6 +518,46 @@ func (*Provider) PostProvision(ctx context.Context, in clusterapi.PostProvisionI
 		}
 	}
 
+	/*
+		installConfig := in.InstallConfig.Config
+		platform := installConfig.Platform.Azure
+		//subscriptionID := ssn.Credentials.SubscriptionID
+		cloudConfiguration := ssn.CloudConfig
+		clusterDomain := in.InstallConfig.Config.ClusterDomain()
+		clusterName := in.InstallConfig.Config.ObjectMeta.Name
+		baseDomain := in.InstallConfig.Config.BaseDomain
+		resourceGroupName := p.ResourceGroupName
+		baseDomainResourceGroupName := in.InstallConfig.Config.Azure.BaseDomainResourceGroupName
+
+		useIPv6 := false
+		for _, network := range in.InstallConfig.Config.Networking.ServiceNetwork {
+			if network.IP.To4() == nil {
+				useIPv6 = true
+			}
+		}
+
+		// Create DNS entries
+		err = CreateDNSEntries(ctx, &CreateDNSEntriesInput{
+			SubscriptionID:              subscriptionID,
+			ResourceGroupName:           resourceGroupName,
+			BaseDomainResourceGroupName: baseDomainResourceGroupName,
+			BaseDomain:                  baseDomain,
+			ClusterDomain:               clusterDomain,
+			ClusterName:                 clusterName,
+			Region:                      platform.Region,
+			InfraID:                     in.InfraID,
+			Private:                     in.InstallConfig.Config.Publish == types.InternalPublishingStrategy,
+			UseIPv6:                     useIPv6,
+			Tags:                        p.Tags,
+			CloudName:                   platform.CloudName,
+			TokenCredential:             ssn.TokenCreds,
+			CloudConfiguration:          cloudConfiguration,
+		})
+		if err != nil {
+			log.Fatalf("failed to create DNS entries: %v", err)
+		}
+	*/
+
 	return nil
 }