Merge pull request #8243 from mjturek/custom-resolver

MULTIARCH-4550: Power VS: Use a custom resolver when publish strategy is Internal

Author: openshift-merge-bot[bot]

pkg/asset/installconfig/powervs/client.go

@@ -39,13 +39,15 @@ type API interface {
 	GetDNSZoneIDByName(ctx context.Context, name string, publish types.PublishingStrategy) (string, error)
 	GetDNSZones(ctx context.Context, publish types.PublishingStrategy) ([]DNSZoneResponse, error)
 	GetDNSInstancePermittedNetworks(ctx context.Context, dnsID string, dnsZone string) ([]string, error)
+	GetDNSCustomResolverIP(ctx context.Context, dnsID string, vpcID string) (string, error)
 	CreateDNSRecord(ctx context.Context, crnstr string, baseDomain string, hostname string, cname string) error
 
 	// VPC
 	GetVPCByName(ctx context.Context, vpcName string) (*vpcv1.VPC, error)
 	GetPublicGatewayByVPC(ctx context.Context, vpcName string) (*vpcv1.PublicGateway, error)
 	SetVPCServiceURLForRegion(ctx context.Context, region string) error
 	GetVPCs(ctx context.Context, region string) ([]vpcv1.VPC, error)
+	GetVPCSubnets(ctx context.Context, vpcID string) ([]vpcv1.Subnet, error)
 
 	// TG
 	GetTGConnectionVPC(ctx context.Context, gatewayID string, vpcSubnetID string) (string, error)
@@ -253,7 +255,6 @@ func (c *Client) GetDNSRecordsByName(ctx context.Context, crnstr string, zoneID
 
 // GetInstanceCRNByName finds the CRN of the instance with the specified name.
 func (c *Client) GetInstanceCRNByName(ctx context.Context, name string, publish types.PublishingStrategy) (string, error) {
-
 	zones, err := c.GetDNSZones(ctx, publish)
 	if err != nil {
 		return "", err
@@ -268,9 +269,33 @@ func (c *Client) GetInstanceCRNByName(ctx context.Context, name string, publish
 	return "", fmt.Errorf("DNS zone %q not found", name)
 }
 
+// GetDNSCustomResolverIP gets the DNS Server IP of a custom resolver associated with the specified VPC subnet in the specified DNS zone.
+func (c *Client) GetDNSCustomResolverIP(ctx context.Context, dnsID string, vpcID string) (string, error) {
+	listCustomResolversOptions := c.dnsServicesAPI.NewListCustomResolversOptions(dnsID)
+	customResolvers, _, err := c.dnsServicesAPI.ListCustomResolversWithContext(ctx, listCustomResolversOptions)
+	if err != nil {
+		return "", err
+	}
+
+	subnets, err := c.GetVPCSubnets(ctx, vpcID)
+	if err != nil {
+		return "", err
+	}
+
+	for _, customResolver := range customResolvers.CustomResolvers {
+		for _, location := range customResolver.Locations {
+			for _, subnet := range subnets {
+				if *subnet.CRN == *location.SubnetCrn {
+					return *location.DnsServerIp, nil
+				}
+			}
+		}
+	}
+	return "", fmt.Errorf("DNS server IP of custom resolver for %q not found", dnsID)
+}
+
 // GetDNSZoneIDByName gets the CIS zone ID from its domain name.
 func (c *Client) GetDNSZoneIDByName(ctx context.Context, name string, publish types.PublishingStrategy) (string, error) {
-
 	zones, err := c.GetDNSZones(ctx, publish)
 	if err != nil {
 		return "", err
@@ -372,7 +397,7 @@ func (c *Client) GetDNSZones(ctx context.Context, publish types.PublishingStrate
 	return allZones, nil
 }
 
-// GetDNSInstancePermittedNetworks gets the permitted VPC networks for a DNS Services instance
+// GetDNSInstancePermittedNetworks gets the permitted VPC networks for a DNS Services instance.
 func (c *Client) GetDNSInstancePermittedNetworks(ctx context.Context, dnsID string, dnsZone string) ([]string, error) {
 	_, cancel := context.WithTimeout(ctx, 1*time.Minute)
 	defer cancel()
@@ -510,6 +535,18 @@ func (c *Client) GetPublicGatewayByVPC(ctx context.Context, vpcName string) (*vp
 	return nil, nil
 }
 
+// GetVPCSubnets retrieves all subnets in the given VPC.
+func (c *Client) GetVPCSubnets(ctx context.Context, vpcID string) ([]vpcv1.Subnet, error) {
+	listSubnetsOptions := c.vpcAPI.NewListSubnetsOptions()
+	listSubnetsOptions.VPCID = &vpcID
+	subnets, _, err := c.vpcAPI.ListSubnetsWithContext(ctx, listSubnetsOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	return subnets.Subnets, nil
+}
+
 // GetSubnetByName gets a VPC Subnet by its name and region.
 func (c *Client) GetSubnetByName(ctx context.Context, subnetName string, region string) (*vpcv1.Subnet, error) {
 	_, cancel := context.WithTimeout(ctx, 1*time.Minute)

pkg/asset/installconfig/powervs/metadata.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/IBM-Cloud/bluemix-go/crn"
+	"github.com/IBM/vpc-go-sdk/vpcv1"
 
 	"github.com/openshift/installer/pkg/types"
 )
@@ -240,3 +241,43 @@ func (m *Metadata) IsVPCPermittedNetwork(ctx context.Context, vpcName string, ba
 
 	return false, nil
 }
+
+// GetSubnetID gets the ID of a VPC subnet by name and region.
+func (m *Metadata) GetSubnetID(ctx context.Context, subnetName string, vpcRegion string) (string, error) {
+	subnet, err := m.client.GetSubnetByName(ctx, subnetName, vpcRegion)
+	if err != nil {
+		return "", err
+	}
+	return *subnet.ID, err
+}
+
+// GetVPCSubnets gets a list of subnets in a VPC.
+func (m *Metadata) GetVPCSubnets(ctx context.Context, vpcName string) ([]vpcv1.Subnet, error) {
+	vpc, err := m.client.GetVPCByName(ctx, vpcName)
+	if err != nil {
+		return nil, err
+	}
+	subnets, err := m.client.GetVPCSubnets(ctx, *vpc.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get VPC subnets: %w", err)
+	}
+	return subnets, err
+}
+
+// GetDNSServerIP gets the IP of a custom resolver for DNS use.
+func (m *Metadata) GetDNSServerIP(ctx context.Context, vpcName string) (string, error) {
+	vpc, err := m.client.GetVPCByName(ctx, vpcName)
+	if err != nil {
+		return "", err
+	}
+
+	dnsCRN, err := crn.Parse(m.dnsInstanceCRN)
+	if err != nil {
+		return "", fmt.Errorf("failed to parse DNSInstanceCRN: %w", err)
+	}
+	dnsServerIP, err := m.client.GetDNSCustomResolverIP(ctx, dnsCRN.ServiceInstance, *vpc.ID)
+	if err != nil {
+		return "", err
+	}
+	return dnsServerIP, nil
+}

pkg/asset/installconfig/powervs/mock/powervsclient_generated.go

@@ -1,6 +1,7 @@
 package powervs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/sirupsen/logrus"
@@ -12,6 +13,7 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
+	"github.com/openshift/installer/pkg/types"
 	powervstypes "github.com/openshift/installer/pkg/types/powervs"
 )
 
@@ -154,15 +156,30 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 		},
 	}
 
-	// Avoid empty manifest elements
-	logrus.Debugf("GenerateClusterAssets: len(VPCSubnets) = %d", len(installConfig.Config.Platform.PowerVS.VPCSubnets))
-	if len(installConfig.Config.Platform.PowerVS.VPCSubnets) > 0 {
-		powerVSCluster.Spec.VPCSubnets = make([]capibm.Subnet, 0)
-		for i := range installConfig.Config.Platform.PowerVS.VPCSubnets {
-			// We cannot get the string in the loop and add it as it appears duplicated in the generated file
+	// Use a custom resolver if using an Internal publishing strategy
+	if installConfig.Config.Publish == types.InternalPublishingStrategy {
+		dnsServerIP, err := installConfig.PowerVS.GetDNSServerIP(context.TODO(), installConfig.Config.PowerVS.VPCName)
+		if err != nil {
+			return nil, fmt.Errorf("unable to find a DNS server for specified VPC: %s %w", installConfig.Config.PowerVS.VPCName, err)
+		}
+
+		powerVSCluster.Spec.DHCPServer = &capibm.DHCPServer{
+			DNSServer: &dnsServerIP,
+		}
+	}
+
+	// If a VPC was specified, pass all subnets in it to cluster API
+	if installConfig.Config.Platform.PowerVS.VPCName != "" {
+		logrus.Debugf("GenerateClusterAssets: VPCName = %s", installConfig.Config.Platform.PowerVS.VPCName)
+		subnets, err := installConfig.PowerVS.GetVPCSubnets(context.TODO(), vpcName)
+		if err != nil {
+			return nil, fmt.Errorf("error getting subnets in specified VPC: %s %w", installConfig.Config.PowerVS.VPCName, err)
+		}
+		for _, subnet := range subnets {
 			powerVSCluster.Spec.VPCSubnets = append(powerVSCluster.Spec.VPCSubnets,
 				capibm.Subnet{
-					ID: &installConfig.Config.Platform.PowerVS.VPCSubnets[i],
+					ID:   subnet.ID,
+					Name: subnet.Name,
 				})
 		}
 		logrus.Debugf("GenerateClusterAssets: subnets = %+v", powerVSCluster.Spec.VPCSubnets)