From 27271ccbf16a736f752b8f52d7d951e1bc6e64a1 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Fri, 1 Jul 2016 01:28:46 +0200 Subject: [PATCH] Cluster autoscaler: add handlign for nill mig configs (in case not all node pools are autoscaled) --- cluster-autoscaler/scale_down.go | 5 +++++ cluster-autoscaler/utils.go | 3 +++ 2 files changed, 8 insertions(+) diff --git a/cluster-autoscaler/scale_down.go b/cluster-autoscaler/scale_down.go index 224dd3ecb6..5c18f964db 100644 --- a/cluster-autoscaler/scale_down.go +++ b/cluster-autoscaler/scale_down.go @@ -133,6 +133,11 @@ func ScaleDown( glog.Errorf("Error while checking mig config for instance %v: %v", instance, err) continue } + if migConfig == nil { + glog.V(4).Infof("Skipping %s - no mig config", node.Name) + continue + } + size, err := gceManager.GetMigSize(migConfig) if err != nil { glog.Errorf("Error while checking mig size for instance %v: %v", instance, err) diff --git a/cluster-autoscaler/utils.go b/cluster-autoscaler/utils.go index 5502107740..7b7214b050 100644 --- a/cluster-autoscaler/utils.go +++ b/cluster-autoscaler/utils.go @@ -276,6 +276,9 @@ func GetNodeInfosForMigs(nodes []*kube_api.Node, gceManager *gce.GceManager, kub if err != nil { return map[string]*schedulercache.NodeInfo{}, err } + if migConfig == nil { + continue + } url := migConfig.Url() nodeInfo, err := simulator.BuildNodeInfoForNode(node, kubeClient)