From fcbbaef98ab9880139fee0fe9d2fb30a76b692c3 Mon Sep 17 00:00:00 2001
From: Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>
Date: Tue, 16 Feb 2021 04:51:07 -0800
Subject: [PATCH] Merge pull request #3883 from MaciekPytel/fix_antiaffinity
Set different hostname label for upcoming nodes
---
cluster-autoscaler/core/static_autoscaler.go | 19 ++------------
.../estimator/binpacking_estimator.go | 20 +++++----------
.../utils/scheduler/scheduler.go | 25 +++++++++++++++++++
3 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/cluster-autoscaler/core/static_autoscaler.go b/cluster-autoscaler/core/static_autoscaler.go
index 74c495f9a572..cb5a8c7464a6 100644
--- a/cluster-autoscaler/core/static_autoscaler.go
+++ b/cluster-autoscaler/core/static_autoscaler.go
@@ -23,7 +23,6 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
- "k8s.io/apimachinery/pkg/util/uuid"
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
@@ -42,6 +41,7 @@ import (
"k8s.io/autoscaler/cluster-autoscaler/utils/deletetaint"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
+ scheduler_utils "k8s.io/autoscaler/cluster-autoscaler/utils/scheduler"
"k8s.io/autoscaler/cluster-autoscaler/utils/taints"
"k8s.io/autoscaler/cluster-autoscaler/utils/tpu"
@@ -775,21 +775,6 @@ func allPodsAreNew(pods []*apiv1.Pod, currentTime time.Time) bool {
return found && oldest.Add(unschedulablePodWithGpuTimeBuffer).After(currentTime)
}
-func deepCopyNodeInfo(nodeTemplate *schedulerframework.NodeInfo, index int) *schedulerframework.NodeInfo {
- node := nodeTemplate.Node().DeepCopy()
- node.Name = fmt.Sprintf("%s-%d", node.Name, index)
- node.UID = uuid.NewUUID()
- nodeInfo := schedulerframework.NewNodeInfo()
- nodeInfo.SetNode(node)
- for _, podInfo := range nodeTemplate.Pods {
- pod := podInfo.Pod.DeepCopy()
- pod.Name = fmt.Sprintf("%s-%d", podInfo.Pod.Name, index)
- pod.UID = uuid.NewUUID()
- nodeInfo.AddPod(pod)
- }
- return nodeInfo
-}
-
func getUpcomingNodeInfos(registry *clusterstate.ClusterStateRegistry, nodeInfos map[string]*schedulerframework.NodeInfo) []*schedulerframework.NodeInfo {
upcomingNodes := make([]*schedulerframework.NodeInfo, 0)
for nodeGroup, numberOfNodes := range registry.GetUpcomingNodes() {
@@ -808,7 +793,7 @@ func getUpcomingNodeInfos(registry *clusterstate.ClusterStateRegistry, nodeInfos
// Ensure new nodes have different names because nodeName
// will be used as a map key. Also deep copy pods (daemonsets &
// any pods added by cloud provider on template).
- upcomingNodes = append(upcomingNodes, deepCopyNodeInfo(nodeTemplate, i))
+ upcomingNodes = append(upcomingNodes, scheduler_utils.DeepCopyTemplateNode(nodeTemplate, i))
}
}
return upcomingNodes
diff --git a/cluster-autoscaler/estimator/binpacking_estimator.go b/cluster-autoscaler/estimator/binpacking_estimator.go
index 45d5f792b9c4..a8b09eda09b9 100644
--- a/cluster-autoscaler/estimator/binpacking_estimator.go
+++ b/cluster-autoscaler/estimator/binpacking_estimator.go
@@ -17,13 +17,12 @@ limitations under the License.
package estimator
import (
- "fmt"
"sort"
- "time"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/autoscaler/cluster-autoscaler/simulator"
+ "k8s.io/autoscaler/cluster-autoscaler/utils/scheduler"
klog "k8s.io/klog/v2"
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
)
@@ -75,7 +74,6 @@ func (estimator *BinpackingNodeEstimator) Estimate(
}
}()
- newNodeNameTimestamp := time.Now()
newNodeNameIndex := 0
for _, podInfo := range podInfos {
@@ -94,7 +92,7 @@ func (estimator *BinpackingNodeEstimator) Estimate(
if !found {
// Add new node
- newNodeName, err := estimator.addNewNodeToSnapshot(nodeTemplate, newNodeNameTimestamp, newNodeNameIndex)
+ newNodeName, err := estimator.addNewNodeToSnapshot(nodeTemplate, newNodeNameIndex)
if err != nil {
klog.Errorf("Error while adding new node for template to ClusterSnapshot; %v", err)
return 0
@@ -113,23 +111,17 @@ func (estimator *BinpackingNodeEstimator) Estimate(
func (estimator *BinpackingNodeEstimator) addNewNodeToSnapshot(
template *schedulerframework.NodeInfo,
- nameTimestamp time.Time,
nameIndex int) (string, error) {
- newNode := template.Node().DeepCopy()
- newNode.Name = fmt.Sprintf("%s-%d-%d", newNode.Name, nameTimestamp.Unix(), nameIndex)
- if newNode.Labels == nil {
- newNode.Labels = make(map[string]string)
- }
- newNode.Labels["kubernetes.io/hostname"] = newNode.Name
+ newNodeInfo := scheduler.DeepCopyTemplateNode(template, nameIndex)
var pods []*apiv1.Pod
- for _, podInfo := range template.Pods {
+ for _, podInfo := range newNodeInfo.Pods {
pods = append(pods, podInfo.Pod)
}
- if err := estimator.clusterSnapshot.AddNodeWithPods(newNode, pods); err != nil {
+ if err := estimator.clusterSnapshot.AddNodeWithPods(newNodeInfo.Node(), pods); err != nil {
return "", err
}
- return newNode.Name, nil
+ return newNodeInfo.Node().Name, nil
}
// Calculates score for all pods and returns podInfo structure.
diff --git a/cluster-autoscaler/utils/scheduler/scheduler.go b/cluster-autoscaler/utils/scheduler/scheduler.go
index 94451a362d33..3872b0ed33f2 100644
--- a/cluster-autoscaler/utils/scheduler/scheduler.go
+++ b/cluster-autoscaler/utils/scheduler/scheduler.go
@@ -17,7 +17,10 @@ limitations under the License.
package scheduler
import (
+ "fmt"
+
apiv1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/util/uuid"
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
)
@@ -57,3 +60,25 @@ func CreateNodeNameToInfoMap(pods []*apiv1.Pod, nodes []*apiv1.Node) map[string]
return nodeNameToNodeInfo
}
+
+// DeepCopyTemplateNode copies NodeInfo object used as a template. It changes
+// names of UIDs of both node and pods running on it, so that copies can be used
+// to represent multiple nodes.
+func DeepCopyTemplateNode(nodeTemplate *schedulerframework.NodeInfo, index int) *schedulerframework.NodeInfo {
+ node := nodeTemplate.Node().DeepCopy()
+ node.Name = fmt.Sprintf("%s-%d", node.Name, index)
+ node.UID = uuid.NewUUID()
+ if node.Labels == nil {
+ node.Labels = make(map[string]string)
+ }
+ node.Labels["kubernetes.io/hostname"] = node.Name
+ nodeInfo := schedulerframework.NewNodeInfo()
+ nodeInfo.SetNode(node)
+ for _, podInfo := range nodeTemplate.Pods {
+ pod := podInfo.Pod.DeepCopy()
+ pod.Name = fmt.Sprintf("%s-%d", podInfo.Pod.Name, index)
+ pod.UID = uuid.NewUUID()
+ nodeInfo.AddPod(pod)
+ }
+ return nodeInfo
+}