Merge pull request openshift#1233 from abhinavdahiya/dns_zones

manifest: set the public and private zones for AWS

pkg/asset/installconfig/aws/basedomain.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/pkg/errors"
@@ -78,3 +79,30 @@ func GetBaseDomain() (string, error) {
 
 	return domain, nil
 }
+
+// GetPublicZone returns a public route53 zone that matches the name.
+func GetPublicZone(name string) (*route53.HostedZone, error) {
+	var res *route53.HostedZone
+	f := func(resp *route53.ListHostedZonesOutput, lastPage bool) (shouldContinue bool) {
+		for idx, zone := range resp.HostedZones {
+			if zone.Config != nil && !aws.BoolValue(zone.Config.PrivateZone) && strings.TrimSuffix(aws.StringValue(zone.Name), ".") == strings.TrimSuffix(name, ".") {
+				res = resp.HostedZones[idx]
+				return false
+			}
+		}
+		return !lastPage
+	}
+
+	session, err := GetSession()
+	if err != nil {
+		return nil, errors.Wrap(err, "getting AWS session")
+	}
+	client := route53.New(session)
+	if err := client.ListHostedZonesPages(&route53.ListHostedZonesInput{}, f); err != nil {
+		return nil, errors.Wrap(err, "listing hosted zones")
+	}
+	if res == nil {
+		return nil, errors.Errorf("No public route53 zone found matching name %q", name)
+	}
+	return res, nil
+}

pkg/asset/manifests/dns.go

@@ -1,17 +1,24 @@
 package manifests
 
 import (
+	"fmt"
 	"path/filepath"
+	"strings"
 
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 
+	configv1 "github.com/openshift/api/config/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
+	icaws "github.com/openshift/installer/pkg/asset/installconfig/aws"
 	"github.com/openshift/installer/pkg/asset/templates/content"
-
-	configv1 "github.com/openshift/api/config/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	awstypes "github.com/openshift/installer/pkg/types/aws"
+	libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
+	nonetypes "github.com/openshift/installer/pkg/types/none"
+	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
 )
 
 var (
@@ -36,13 +43,19 @@ func (*DNS) Name() string {
 func (*DNS) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.InstallConfig{},
+		&installconfig.ClusterID{},
+		// PlatformCredsCheck just checks the creds (and asks, if needed)
+		// We do not actually use it in this asset directly, hence
+		// it is put in the dependencies but not fetched in Generate
+		&installconfig.PlatformCredsCheck{},
 	}
 }
 
 // Generate generates the DNS config and its CRD.
 func (d *DNS) Generate(dependencies asset.Parents) error {
 	installConfig := &installconfig.InstallConfig{}
-	dependencies.Get(installConfig)
+	clusterID := &installconfig.ClusterID{}
+	dependencies.Get(installConfig, clusterID)
 
 	config := &configv1.DNS{
 		TypeMeta: metav1.TypeMeta{
@@ -58,6 +71,23 @@ func (d *DNS) Generate(dependencies asset.Parents) error {
 		},
 	}
 
+	switch installConfig.Config.Platform.Name() {
+	case awstypes.Name:
+		zone, err := icaws.GetPublicZone(installConfig.Config.BaseDomain)
+		if err != nil {
+			return errors.Wrapf(err, "getting public zone for %q", installConfig.Config.BaseDomain)
+		}
+		config.Spec.PublicZone = &configv1.DNSZone{ID: strings.TrimPrefix(*zone.Id, "/hostedzone/")}
+		config.Spec.PrivateZone = &configv1.DNSZone{Tags: map[string]string{
+			"openshiftClusterID":                                                          clusterID.ClusterID,
+			fmt.Sprintf("kubernetes.io/cluster/%s", installConfig.Config.ObjectMeta.Name): "owned",
+			"Name": fmt.Sprintf("%s_int", installConfig.Config.ObjectMeta.Name),
+		}}
+	case libvirttypes.Name, openstacktypes.Name, nonetypes.Name:
+	default:
+		return errors.New("invalid Platform")
+	}
+
 	configData, err := yaml.Marshal(config)
 	if err != nil {
 		return errors.Wrapf(err, "failed to create %s manifests from InstallConfig", d.Name())