Infer gossip DNS from cluster name

nodeup/pkg/model/dns/builder.go

@@ -32,7 +32,7 @@ var _ fi.ModelBuilder = &GossipBuilder{}
 
 // Build is responsible for configuring the gossip DNS tasks.
 func (b *GossipBuilder) Build(c *fi.ModelBuilderContext) error {
-	useGossip := dns.IsGossipHostname(b.Cluster.Spec.MasterInternalName)
+	useGossip := dns.IsGossipHostname(b.Cluster.Name)
 	if !useGossip {
 		return nil
 	}

nodeup/pkg/model/protokube.go

@@ -48,7 +48,7 @@ var _ fi.ModelBuilder = &ProtokubeBuilder{}
 
 // Build is responsible for generating the options for protokube
 func (t *ProtokubeBuilder) Build(c *fi.ModelBuilderContext) error {
-	useGossip := dns.IsGossipHostname(t.Cluster.Spec.MasterInternalName)
+	useGossip := dns.IsGossipHostname(t.Cluster.Name)
 
 	// check is not a master and we are not using gossip (https://github.com/kubernetes/kops/pull/3091)
 	if !t.IsMaster && !useGossip {
@@ -209,8 +209,8 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) (*Protokube
 		// argv = append(argv, "--zone=*/*")
 	}
 
-	if dns.IsGossipHostname(t.Cluster.Spec.MasterInternalName) {
-		klog.Warningf("MasterInternalName %q implies gossip DNS", t.Cluster.Spec.MasterInternalName)
+	if dns.IsGossipHostname(t.Cluster.Name) {
+		klog.Warningf("Cluster name %q implies gossip DNS", t.Cluster.Name)
 		f.Gossip = fi.Bool(true)
 		if t.Cluster.Spec.GossipConfig != nil {
 			f.GossipProtocol = t.Cluster.Spec.GossipConfig.Protocol

pkg/apis/kops/validation/validation.go

@@ -1614,7 +1614,7 @@ func validateExternalDNS(cluster *kops.Cluster, spec *kops.ExternalDNSConfig, fl
 	}
 
 	if spec.Provider == kops.ExternalDNSProviderExternalDNS {
-		if dns.IsGossipHostname(cluster.Spec.MasterInternalName) {
+		if dns.IsGossipHostname(cluster.Name) {
 			allErrs = append(allErrs, field.Forbidden(fldPath.Child("provider"), "external-dns does not support gossip clusters"))
 		}
 	}

pkg/model/awsmodel/iam.go

@@ -237,7 +237,7 @@ func (b *IAMModelBuilder) buildIAMRolePolicy(role iam.Subject, iamName string, i
 		},
 	}
 
-	if !dns.IsGossipHostname(b.Cluster.ObjectMeta.Name) {
+	if !dns.IsGossipHostname(b.Cluster.Name) {
 		// This is slightly tricky; we need to know the hosted zone id,
 		// but we might be creating the hosted zone dynamically.
 		// We create a stub-reference which will be combined by the execution engine.

pkg/model/components/etcdmanager/model.go

@@ -293,7 +293,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
 	// The dns suffix logic mirrors the existing logic, so we should be compatible with existing clusters
 	// (etcd makes it difficult to change peer urls, treating it as a cluster event, for reasons unknown)
 	dnsInternalSuffix := ""
-	if dns.IsGossipHostname(b.Cluster.Spec.MasterInternalName) {
+	if dns.IsGossipHostname(b.Cluster.Name) {
 		// @TODO: This is hacky, but we want it so that we can have a different internal & external name
 		dnsInternalSuffix = b.Cluster.Spec.MasterInternalName
 		dnsInternalSuffix = strings.TrimPrefix(dnsInternalSuffix, "api.")

upup/pkg/fi/cloudup/apply_cluster.go

@@ -302,7 +302,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
 	if cluster.Spec.KubernetesVersion == "" {
 		return fmt.Errorf("KubernetesVersion not set")
 	}
-	if cluster.Spec.DNSZone == "" && !dns.IsGossipHostname(cluster.ObjectMeta.Name) {
+	if cluster.Spec.DNSZone == "" && !dns.IsGossipHostname(cluster.Name) {
 		return fmt.Errorf("DNSZone not set")
 	}
 
@@ -483,7 +483,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
 	modelContext.SSHPublicKeys = sshPublicKeys
 	modelContext.Region = cloud.Region()
 
-	if dns.IsGossipHostname(cluster.ObjectMeta.Name) {
+	if dns.IsGossipHostname(cluster.Name) {
 		klog.V(2).Infof("Gossip DNS: skipping DNS validation")
 	} else {
 		err = validateDNS(cluster, cloud)
@@ -1306,7 +1306,7 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit
 		return nil, nil, fmt.Errorf("cannot determine role for instance group: %v", ig.ObjectMeta.Name)
 	}
 
-	useGossip := dns.IsGossipHostname(cluster.Spec.MasterInternalName)
+	useGossip := dns.IsGossipHostname(cluster.Name)
 	isMaster := role == kops.InstanceGroupRoleMaster
 	hasAPIServer := isMaster || role == kops.InstanceGroupRoleAPIServer
 

upup/pkg/fi/cloudup/populate_cluster_spec.go

@@ -220,7 +220,7 @@ func (c *populateClusterSpec) run(clientset simple.Clientset) error {
 		klog.V(2).Infof("Normalizing kubernetes version: %q -> %q", cluster.Spec.KubernetesVersion, versionWithoutV)
 		cluster.Spec.KubernetesVersion = versionWithoutV
 	}
-	if cluster.Spec.DNSZone == "" && !dns.IsGossipHostname(cluster.ObjectMeta.Name) {
+	if cluster.Spec.DNSZone == "" && !dns.IsGossipHostname(cluster.Name) {
 		dns, err := cloud.DNS()
 		if err != nil {
 			return err

upup/pkg/fi/cloudup/template_functions.go

@@ -127,7 +127,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	dest["GossipDomains"] = func() []string {
 		var names []string
 
-		if dns.IsGossipHostname(cluster.Spec.MasterInternalName) {
+		if dns.IsGossipHostname(cluster.Name) {
 			names = append(names, "k8s.local")
 		}
 
@@ -485,7 +485,7 @@ func (tf *TemplateFunctions) DNSControllerArgv() ([]string, error) {
 		}
 	}
 
-	if dns.IsGossipHostname(cluster.Spec.MasterInternalName) {
+	if dns.IsGossipHostname(cluster.Name) {
 		argv = append(argv, "--dns=gossip")
 
 		// Configuration specifically for the DNS controller gossip
@@ -665,7 +665,7 @@ func (tf *TemplateFunctions) KopsControllerConfig() (string, error) {
 		config.EnableCloudIPAM = true
 	}
 
-	if dns.IsGossipHostname(cluster.Spec.MasterInternalName) {
+	if dns.IsGossipHostname(cluster.Name) {
 		config.Discovery = &kopscontrollerconfig.DiscoveryOptions{
 			Enabled: true,
 		}