From 31dbd6c50aec27745f3d37ce7c2d6ce92ca08d2c Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Tue, 29 Nov 2022 21:15:09 -0800
Subject: [PATCH] Stop trying to populate arbitrary cluster fields from the
 channel

---
 pkg/apis/kops/channel.go           | 9 ---------
 upup/pkg/fi/cloudup/new_cluster.go | 9 +++------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go
index 181396f898..d2e16c5b0d 100644
--- a/pkg/apis/kops/channel.go
+++ b/pkg/apis/kops/channel.go
@@ -352,15 +352,6 @@ func RecommendedKubernetesVersion(c *Channel, kopsVersionString string) *semver.
 		}
 	}
 
-	if c.Spec.Cluster != nil {
-		sv, err := util.ParseKubernetesVersion(c.Spec.Cluster.KubernetesVersion)
-		if err != nil {
-			klog.Warningf("unable to parse kubernetes version %q", c.Spec.Cluster.KubernetesVersion)
-		} else {
-			return sv
-		}
-	}
-
 	return nil
 }
 
diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go
index f4cd0ce844..d0cd5d6b7f 100644
--- a/upup/pkg/fi/cloudup/new_cluster.go
+++ b/upup/pkg/fi/cloudup/new_cluster.go
@@ -202,16 +202,13 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
 		},
 	}
 
-	if channel.Spec.Cluster != nil {
-		cluster.Spec = *channel.Spec.Cluster
-
+	cluster.Spec.Channel = opt.Channel
+	if opt.KubernetesVersion == "" {
 		kubernetesVersion := api.RecommendedKubernetesVersion(channel, kops.Version)
 		if kubernetesVersion != nil {
 			cluster.Spec.KubernetesVersion = kubernetesVersion.String()
 		}
-	}
-	cluster.Spec.Channel = opt.Channel
-	if opt.KubernetesVersion != "" {
+	} else {
 		cluster.Spec.KubernetesVersion = opt.KubernetesVersion
 	}