Merge pull request kubernetes#2948 from towca/jtuznik/node-info-processor

Add NodeInfoProcessor for proccesing nodeInfosForNodeGroups

Author: k8s-ci-robot

cluster-autoscaler/core/scale_test_common.go

@@ -34,6 +34,7 @@ import (
 	processor_callbacks "k8s.io/autoscaler/cluster-autoscaler/processors/callbacks"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/nodegroups"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/nodegroupset"
+	"k8s.io/autoscaler/cluster-autoscaler/processors/nodeinfos"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/status"
 	"k8s.io/autoscaler/cluster-autoscaler/simulator"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
@@ -138,6 +139,7 @@ func NewTestProcessors() *processors.AutoscalingProcessors {
 		ScaleDownStatusProcessor:   &status.NoOpScaleDownStatusProcessor{},
 		AutoscalingStatusProcessor: &status.NoOpAutoscalingStatusProcessor{},
 		NodeGroupManager:           nodegroups.NewDefaultNodeGroupManager(),
+		NodeInfoProcessor:          nodeinfos.NewDefaultNodeInfoProcessor(),
 	}
 }
 

cluster-autoscaler/core/static_autoscaler.go

@@ -269,6 +269,12 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError
 		return autoscalerError.AddPrefix("failed to build node infos for node groups: ")
 	}
 
+	nodeInfosForGroups, err = a.processors.NodeInfoProcessor.Process(autoscalingContext, nodeInfosForGroups)
+	if err != nil {
+		klog.Errorf("Failed to process nodeInfos: %v", err)
+		return errors.ToAutoscalerError(errors.InternalError, err)
+	}
+
 	if typedErr := a.updateClusterState(allNodes, nodeInfosForGroups, currentTime); typedErr != nil {
 		klog.Errorf("Failed to update cluster state: %v", typedErr)
 		return typedErr

cluster-autoscaler/processors/nodeinfos/node_info_processor.go

@@ -0,0 +1,48 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package nodeinfos
+
+import (
+	"k8s.io/autoscaler/cluster-autoscaler/context"
+	"k8s.io/kubernetes/pkg/scheduler/nodeinfo"
+)
+
+// NodeInfoProcessor processes nodeInfos after they're created.
+type NodeInfoProcessor interface {
+	// Process processes a map of nodeInfos for node groups.
+	Process(ctx *context.AutoscalingContext, nodeInfosForNodeGroups map[string]*nodeinfo.NodeInfo) (map[string]*nodeinfo.NodeInfo, error)
+	// CleanUp cleans up processor's internal structures.
+	CleanUp()
+}
+
+// NoOpNodeInfoProcessor doesn't change nodeInfos.
+type NoOpNodeInfoProcessor struct {
+}
+
+// Process returns unchanged nodeInfos.
+func (p *NoOpNodeInfoProcessor) Process(ctx *context.AutoscalingContext, nodeInfosForNodeGroups map[string]*nodeinfo.NodeInfo) (map[string]*nodeinfo.NodeInfo, error) {
+	return nodeInfosForNodeGroups, nil
+}
+
+// CleanUp cleans up processor's internal structures.
+func (p *NoOpNodeInfoProcessor) CleanUp() {
+}
+
+// NewDefaultNodeInfoProcessor returns a default instance of NodeInfoProcessor.
+func NewDefaultNodeInfoProcessor() NodeInfoProcessor {
+	return &NoOpNodeInfoProcessor{}
+}

cluster-autoscaler/processors/processors.go

@@ -19,6 +19,7 @@ package processors
 import (
 	"k8s.io/autoscaler/cluster-autoscaler/processors/nodegroups"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/nodegroupset"
+	"k8s.io/autoscaler/cluster-autoscaler/processors/nodeinfos"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/nodes"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/pods"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/status"
@@ -43,6 +44,8 @@ type AutoscalingProcessors struct {
 	AutoscalingStatusProcessor status.AutoscalingStatusProcessor
 	// NodeGroupManager is responsible for creating/deleting node groups.
 	NodeGroupManager nodegroups.NodeGroupManager
+	// NodeInfoProcessor is used to process nodeInfos after they're created.
+	NodeInfoProcessor nodeinfos.NodeInfoProcessor
 }
 
 // DefaultProcessors returns default set of processors.
@@ -56,6 +59,7 @@ func DefaultProcessors() *AutoscalingProcessors {
 		ScaleDownStatusProcessor:   status.NewDefaultScaleDownStatusProcessor(),
 		AutoscalingStatusProcessor: status.NewDefaultAutoscalingStatusProcessor(),
 		NodeGroupManager:           nodegroups.NewDefaultNodeGroupManager(),
+		NodeInfoProcessor:          nodeinfos.NewDefaultNodeInfoProcessor(),
 	}
 }
 
@@ -69,4 +73,5 @@ func (ap *AutoscalingProcessors) CleanUp() {
 	ap.AutoscalingStatusProcessor.CleanUp()
 	ap.NodeGroupManager.CleanUp()
 	ap.ScaleDownNodeProcessor.CleanUp()
+	ap.NodeInfoProcessor.CleanUp()
 }