Merge pull request #14846 from hakman/gossip_to_dns-none

Allow migration from Gossip DNS to no DNS

pkg/apis/kops/cluster.go

@@ -820,11 +820,11 @@ func (c *Cluster) IsSharedAzureRouteTable() bool {
 }
 
 func (c *Cluster) IsGossip() bool {
-	if dns.IsGossipClusterName(c.Name) {
+	if c.UsesNoneDNS() || !dns.IsGossipClusterName(c.Name) {
-		return true
-	}
 		return false
 	}
+	return true
+}
 
 func (c *Cluster) UsesPublicDNS() bool {
 	if c.Spec.Networking.Topology == nil || c.Spec.Networking.Topology.DNS == "" || c.Spec.Networking.Topology.DNS == DNSTypePublic {

upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template

@@ -76,8 +76,8 @@ data:
           fallthrough in-addr.arpa ip6.arpa
           ttl 30
         }
-    {{- if GossipDomains }}
+    {{- if GossipName }}
-        hosts /rootfs/etc/hosts {{ join " " GossipDomains }} {
+        hosts /rootfs/etc/hosts k8s.local {
           ttl 30
           fallthrough
         }
@@ -167,7 +167,7 @@ spec:
         - name: config-volume
           mountPath: /etc/coredns
           readOnly: true
-{{- if GossipDomains }}
+{{- if GossipName }}
         - name: etc-hosts
           mountPath: /rootfs/etc/hosts
           readOnly: true
@@ -209,7 +209,7 @@ spec:
         - name: config-volume
           configMap:
             name: coredns
-{{- if GossipDomains }}
+{{- if GossipName }}
         - name: etc-hosts
           hostPath:
             path: /etc/hosts

upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template

@@ -141,7 +141,7 @@ rules:
   - list
   - watch
   - patch
-{{- if GossipDomains }}
+{{- if GossipEnabled }}
 - apiGroups:
   - ""
   resources:
@@ -213,7 +213,7 @@ rules:
   - leases
   verbs:
   - create
-{{- if GossipDomains }}
+{{- if GossipEnabled }}
 - apiGroups:
   - ""
   resources:

upup/pkg/fi/cloudup/template_functions.go

@@ -45,15 +45,14 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
-	"k8s.io/kops/pkg/flagbuilder"
-	"sigs.k8s.io/yaml"
-
 	kopscontrollerconfig "k8s.io/kops/cmd/kops-controller/pkg/config"
 	"k8s.io/kops/pkg/apis/kops"
 	apiModel "k8s.io/kops/pkg/apis/kops/model"
 	"k8s.io/kops/pkg/apis/kops/util"
 	"k8s.io/kops/pkg/apis/nodeup"
+	"k8s.io/kops/pkg/dns"
 	"k8s.io/kops/pkg/featureflag"
+	"k8s.io/kops/pkg/flagbuilder"
 	"k8s.io/kops/pkg/kubemanifest"
 	"k8s.io/kops/pkg/model"
 	"k8s.io/kops/pkg/model/components/kopscontroller"
@@ -66,6 +65,7 @@ import (
 	gcetpm "k8s.io/kops/upup/pkg/fi/cloudup/gce/tpm"
 	"k8s.io/kops/upup/pkg/fi/cloudup/hetzner"
 	"k8s.io/kops/util/pkg/env"
+	"sigs.k8s.io/yaml"
 )
 
 // TemplateFunctions provides a collection of methods used throughout the templates
@@ -124,14 +124,17 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 		return cluster.Spec.KubeDNS
 	}
 
-	dest["GossipDomains"] = func() []string {
+	dest["GossipEnabled"] = func() bool {
-		var names []string
-
 		if cluster.IsGossip() {
-			names = append(names, "k8s.local")
+			return true
 		}
-
+		return false
-		return names
+	}
+	dest["GossipName"] = func() bool {
+		if dns.IsGossipClusterName(cluster.Name) {
+			return true
+		}
+		return false
 	}
 
 	dest["NodeLocalDNSClusterIP"] = func() string {