From 362601cd664255602ba9c874475fdce8b80ae6e4 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Wed, 21 Dec 2022 18:26:36 +0200
Subject: [PATCH] Allow migration from Gossip DNS to no DNS

---
 pkg/apis/kops/cluster.go                  | 6 +++---
 upup/pkg/fi/cloudup/template_functions.go | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go
index f18c679d63..81f65d8241 100644
--- a/pkg/apis/kops/cluster.go
+++ b/pkg/apis/kops/cluster.go
@@ -820,10 +820,10 @@ func (c *Cluster) IsSharedAzureRouteTable() bool {
 }
 
 func (c *Cluster) IsGossip() bool {
-	if dns.IsGossipClusterName(c.Name) {
-		return true
+	if c.UsesNoneDNS() || !dns.IsGossipClusterName(c.Name) {
+		return false
 	}
-	return false
+	return true
 }
 
 func (c *Cluster) UsesPublicDNS() bool {
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
index 507268faae..6441128ea2 100644
--- a/upup/pkg/fi/cloudup/template_functions.go
+++ b/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
@@ -127,7 +127,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	dest["GossipDomains"] = func() []string {
 		var names []string
 
-		if cluster.IsGossip() {
+		if dns.IsGossipClusterName(cluster.Name) {
 			names = append(names, "k8s.local")
 		}