Merge pull request #1301 from mwielgus/add-null-handling-for-migconfigs

Cluster autoscaler: add handlign for nill mig configs (in case not all l node pools are autoscaled)
kubernetes-retired · Jul 1, 2016 · e2a8815 · e2a8815
2 parents 8a64595 + 27271cc
commit e2a8815
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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)