Merge pull request #763 from mumoshu/fix-ca-scheduling

Fix node labeling to allow scheduling cluster-autoscaler to workers

Author: mumoshu

core/nodepool/config/config.go

@@ -267,6 +267,14 @@ func (c ProvidedConfig) Config() (*ComputedConfig, error) {
 	return &config, nil
 }
 
+func (c ProvidedConfig) NodeLabels() model.NodeLabels {
+	labels := c.NodeSettings.NodeLabels
+	if c.ClusterAutoscalerSupport.Enabled {
+		labels["kube-aws.coreos.com/cluster-autoscaler-supported"] = "true"
+	}
+	return labels
+}
+
 func (c ProvidedConfig) WorkerDeploymentSettings() WorkerDeploymentSettings {
 	return WorkerDeploymentSettings{
 		WorkerNodePoolConfig: c.WorkerNodePoolConfig,
@@ -380,14 +388,6 @@ type WorkerDeploymentSettings struct {
 	DeploymentSettings
 }
 
-func (c WorkerDeploymentSettings) NodeLabels() model.NodeLabels {
-	labels := c.NodeSettings.NodeLabels
-	if c.ClusterAutoscalerSupport.Enabled {
-		labels["kube-aws.coreos.com/cluster-autoscaler-supported"] = "true"
-	}
-	return labels
-}
-
 func (c WorkerDeploymentSettings) WorkerSecurityGroupRefs() []string {
 	refs := []string{}
 

model/controller.go

@@ -35,10 +35,7 @@ func NewDefaultController() Controller {
 			},
 			Tenancy: "default",
 		},
-		NodeSettings: NodeSettings{
-			NodeLabels: NodeLabels{},
-			Taints:     Taints{},
-		},
+		NodeSettings: newNodeSettings(),
 	}
 }
 

model/node_pool_config.go

@@ -46,6 +46,7 @@ func NewDefaultNodePoolConfig() NodePoolConfig {
 			},
 			Tenancy: "default",
 		},
+		NodeSettings:     newNodeSettings(),
 		SecurityGroupIds: []string{},
 		Gpu:              newDefaultGpu(),
 	}

model/node_settings.go

@@ -5,6 +5,13 @@ type NodeSettings struct {
 	Taints     Taints     `yaml:"taints"`
 }
 
+func newNodeSettings() NodeSettings {
+	return NodeSettings{
+		NodeLabels: NodeLabels{},
+		Taints:     Taints{},
+	}
+}
+
 func (s NodeSettings) Validate() error {
 	if err := s.Taints.Valid(); err != nil {
 		return err

test/integration/maincluster_test.go

@@ -1397,9 +1397,10 @@ worker:
 					}
 
 					expectedNodeLabels := model.NodeLabels{
-						"kube-aws.coreos.com/role": "worker",
+						"kube-aws.coreos.com/cluster-autoscaler-supported": "true",
+						"kube-aws.coreos.com/role":                         "worker",
 					}
-					actualNodeLabels := c.NodePools[0].NodeLabels
+					actualNodeLabels := c.NodePools[0].NodeLabels()
 					if !reflect.DeepEqual(expectedNodeLabels, actualNodeLabels) {
 						t.Errorf("worker node labels didn't match: expected=%v, actual=%v", expectedNodeLabels, actualNodeLabels)
 					}