Merge pull request #28 from mwielgus/template-node-pods

Overwrite pod.spec.nodename and node.name in template nodes for scale up

Author: mwielgus

cluster-autoscaler/core/utils.go

@@ -144,35 +144,58 @@ func GetNodeInfosForGroups(nodes []*apiv1.Node, cloudProvider cloudprovider.Clou
 		}
 		id := nodeGroup.Id()
 		if _, found := result[id]; !found {
-			sanitizedNode, err := sanitizeTemplateNodeLables(node)
+			// Build nodeInfo.
+			nodeInfo, err := simulator.BuildNodeInfoForNode(node, kubeClient)
 			if err != nil {
 				return map[string]*schedulercache.NodeInfo{}, err
 			}
 
-			nodeInfo, err := simulator.BuildNodeInfoForNode(sanitizedNode, kubeClient)
+			// Sanitize node name.
+			sanitizedNode, err := sanitizeTemplateNode(node, id)
 			if err != nil {
 				return map[string]*schedulercache.NodeInfo{}, err
 			}
-			result[id] = nodeInfo
+
+			// Update nodename in pods.
+			sanitizedPods := make([]*apiv1.Pod, 0)
+			for _, pod := range nodeInfo.Pods() {
+				obj, err := api.Scheme.DeepCopy(pod)
+				if err != nil {
+					return nil, err
+				}
+				sanitizedPod := obj.(*apiv1.Pod)
+				sanitizedPod.Spec.NodeName = sanitizedNode.Name
+				sanitizedPods = append(sanitizedPods, sanitizedPod)
+			}
+
+			// Build a new node info.
+			sanitizedNodeInfo := schedulercache.NewNodeInfo(sanitizedPods...)
+			if err := sanitizedNodeInfo.SetNode(sanitizedNode); err != nil {
+				return nil, err
+			}
+
+			result[id] = sanitizedNodeInfo
 		}
 	}
 	return result, nil
 }
 
-func sanitizeTemplateNodeLables(node *apiv1.Node) (*apiv1.Node, error) {
+func sanitizeTemplateNode(node *apiv1.Node, nodeGroup string) (*apiv1.Node, error) {
 	obj, err := api.Scheme.DeepCopy(node)
 	if err != nil {
 		return nil, err
 	}
+	nodeName := fmt.Sprintf("template-node-for-%s-%d", nodeGroup, rand.Int63())
 	newNode := obj.(*apiv1.Node)
 	newNode.Labels = make(map[string]string, len(node.Labels))
 	for k, v := range node.Labels {
 		if k != metav1.LabelHostname {
 			newNode.Labels[k] = v
 		} else {
-			newNode.Labels[k] = fmt.Sprintf("template-node-for-cluster-autoscaler-%d", rand.Int63())
+			newNode.Labels[k] = nodeName
 		}
 	}
+	newNode.Name = nodeName
 	return newNode, nil
 }
 

cluster-autoscaler/core/utils_test.go

@@ -105,14 +105,18 @@ func TestRemoveOldUnregisteredNodes(t *testing.T) {
 	assert.Equal(t, "ng1/ng1-2", deletedNode)
 }
 
-func testSanitizeLabels(t *testing.T) {
-	node := BuildTestNode("ng1-1", 1000, 1000)
-	node.Labels[metav1.LabelHostname] = "abc"
-	node.Labels["x"] = "y"
-	node, err := sanitizeTemplateNodeLables(node)
+func TestSanitizeLabels(t *testing.T) {
+	oldNode := BuildTestNode("ng1-1", 1000, 1000)
+	oldNode.Labels = map[string]string{
+		metav1.LabelHostname: "abc",
+		"x":                  "y",
+	}
+	node, err := sanitizeTemplateNode(oldNode, "bzium")
 	assert.NoError(t, err)
 	assert.NotEqual(t, node.Labels[metav1.LabelHostname], "abc")
 	assert.Equal(t, node.Labels["x"], "y")
+	assert.NotEqual(t, node.Name, oldNode.Name)
+	assert.Equal(t, node.Labels[metav1.LabelHostname], node.Name)
 }
 
 func TestRemoveFixNodeTargetSize(t *testing.T) {