Include partial IG Spec in nodeup bootstrap script.

pkg/apis/kops/cluster.go

@@ -113,7 +113,6 @@ type ClusterSpec struct {
 	UpdatePolicy *string `json:"updatePolicy,omitempty"`
 	// Additional policies to add for roles
 	AdditionalPolicies *map[string]string `json:"additionalPolicies,omitempty"`
-
 	// EtcdClusters stores the configuration for each cluster
 	EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"`
 	// Component configurations

pkg/model/bootstrapscript.go

@@ -116,6 +116,22 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cs *kops.Cluste
 			}
 			return string(content), nil
 		},
+
+		"IGSpec": func() (string, error) {
+			spec := make(map[string]interface{})
+			spec["nodeLabels"] = ig.Spec.NodeLabels
+			spec["taints"] = ig.Spec.Taints
+
+			j, err := json.Marshal(spec)
+			if err != nil {
+				return "", err
+			}
+			content, err := yaml.JSONToYAML(j)
+			if err != nil {
+				return "", err
+			}
+			return string(content), nil
+		},
 	}
 
 	templateResource, err := NewTemplateResource("nodeup", resources.AWSNodeUpTemplate, functions, nil)
@@ -129,22 +145,22 @@ func (b *BootstrapScript) createProxyEnv(ps *kops.EgressProxySpec) string {
 	var buffer bytes.Buffer
 
 	if ps != nil && ps.HTTPProxy.Host != "" {
-		var httpProxyUrl string
+		var httpProxyURL string
 
 		// TODO double check that all the code does this
 		// TODO move this into a validate so we can enforce the string syntax
 		if !strings.HasPrefix(ps.HTTPProxy.Host, "http://") {
-			httpProxyUrl = "http://"
+			httpProxyURL = "http://"
 		}
 
 		if ps.HTTPProxy.Port != 0 {
-			httpProxyUrl += ps.HTTPProxy.Host + ":" + strconv.Itoa(ps.HTTPProxy.Port)
+			httpProxyURL += ps.HTTPProxy.Host + ":" + strconv.Itoa(ps.HTTPProxy.Port)
 		} else {
-			httpProxyUrl += ps.HTTPProxy.Host
+			httpProxyURL += ps.HTTPProxy.Host
 		}
 
 		// Set base env variables
-		buffer.WriteString("export http_proxy=" + httpProxyUrl + "\n")
+		buffer.WriteString("export http_proxy=" + httpProxyURL + "\n")
 		buffer.WriteString("export https_proxy=${http_proxy}\n")
 		buffer.WriteString("export no_proxy=" + ps.ProxyExcludes + "\n")
 		buffer.WriteString("export NO_PROXY=${no_proxy}\n")

pkg/model/bootstrapscript_test.go

@@ -167,6 +167,14 @@ func makeTestInstanceGroup(role kops.InstanceGroupRole) *kops.InstanceGroup {
 	return &kops.InstanceGroup{
 		Spec: kops.InstanceGroupSpec{
 			Role: role,
+			NodeLabels: map[string]string{
+				"labelname": "labelvalue",
+				"label2":    "value2",
+			},
+			Taints: []string{
+				"key1=value1:NoSchedule",
+				"key2=value2:NoExecute",
+			},
 		},
 	}
 }

pkg/model/resources/nodeup.go

@@ -145,6 +145,10 @@ cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
 {{ ClusterSpec }}
 __EOF_CLUSTER_SPEC
 
+cat > ig_spec.yaml << __EOF_IG_SPEC
+{{ IGSpec }}
+__EOF_IG_SPEC
+
 cat > kube_env.yaml << __EOF_KUBE_ENV
 {{ KubeEnv }}
 __EOF_KUBE_ENV

pkg/model/tests/data/bootstrapscript_0.txt

@@ -166,6 +166,16 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
+cat > ig_spec.yaml << __EOF_IG_SPEC
+nodeLabels:
+  label2: value2
+  labelname: labelvalue
+taints:
+- key1=value1:NoSchedule
+- key2=value2:NoExecute
+
+__EOF_IG_SPEC
+
 cat > kube_env.yaml << __EOF_KUBE_ENV
 {}
 

pkg/model/tests/data/bootstrapscript_1.txt

@@ -158,6 +158,16 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
+cat > ig_spec.yaml << __EOF_IG_SPEC
+nodeLabels:
+  label2: value2
+  labelname: labelvalue
+taints:
+- key1=value1:NoSchedule
+- key2=value2:NoExecute
+
+__EOF_IG_SPEC
+
 cat > kube_env.yaml << __EOF_KUBE_ENV
 {}