From 1ba0f0d46373262daaaa6e9e8db6cc86ac3b815c Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Sun, 7 Jun 2020 16:23:12 -0700
Subject: [PATCH] Move Taints into the NodeupConfig

---
 nodeup/pkg/model/kubelet.go  | 2 --
 pkg/apis/nodeup/config.go    | 5 ++++-
 pkg/model/bootstrapscript.go | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
index 1b4135eb57..65b0d729a4 100644
--- a/nodeup/pkg/model/kubelet.go
+++ b/nodeup/pkg/model/kubelet.go
@@ -484,8 +484,6 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro
 
 	// Use --register-with-taints
 	{
-		c.Taints = append(c.Taints, b.InstanceGroup.Spec.Taints...)
-
 		if len(c.Taints) == 0 && isMaster {
 			// (Even though the value is empty, we still expect <Key>=<Value>:<Effect>)
 			c.Taints = append(c.Taints, nodelabels.RoleLabelMaster16+"=:"+string(v1.TaintEffectNoSchedule))
diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go
index 89c39d811f..a55f685161 100644
--- a/pkg/apis/nodeup/config.go
+++ b/pkg/apis/nodeup/config.go
@@ -83,6 +83,7 @@ type StaticManifest struct {
 
 func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config {
 	role := instanceGroup.Spec.Role
+	isMaster := role == kops.InstanceGroupRoleMaster
 
 	config := Config{
 		InstanceGroupRole: role,
@@ -90,7 +91,7 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config
 		VolumeMounts:      instanceGroup.Spec.VolumeMounts,
 	}
 
-	if role == kops.InstanceGroupRoleMaster {
+	if isMaster {
 		reflectutils.JSONMergeStruct(&config.KubeletConfig, cluster.Spec.MasterKubelet)
 
 		// A few settings in Kubelet override those in MasterKubelet. I'm not sure why.
@@ -111,5 +112,7 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config
 		}
 	}
 
+	config.KubeletConfig.Taints = append(config.KubeletConfig.Taints, instanceGroup.Spec.Taints...)
+
 	return &config
 }
diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
index 4d827eda5f..f8ae34e1b2 100644
--- a/pkg/model/bootstrapscript.go
+++ b/pkg/model/bootstrapscript.go
@@ -282,7 +282,6 @@ func (b *BootstrapScript) Run(c *fi.Context) error {
 		"IGSpec": func() (string, error) {
 			spec := make(map[string]interface{})
 			spec["nodeLabels"] = b.ig.Spec.NodeLabels
-			spec["taints"] = b.ig.Spec.Taints
 
 			hooks, err := b.getRelevantHooks(b.ig.Spec.Hooks, b.ig.Spec.Role)
 			if err != nil {