kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cluster-autoscaler: fix node group nil issues

This commit is contained in:
Marcin Wielgus 2016-08-26 10:33:43 +02:00
parent 1234ffd5fa
commit eebbf0ff03
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster-autoscaler/scale_down.go
View File

@ -18,6 +18,7 @@ package main
import (
"fmt"
"reflect"
"time"
"k8s.io/contrib/cluster-autoscaler/cloudprovider"
@ -131,7 +132,7 @@ func ScaleDown(
glog.Errorf("Error while checking node group for %s: %v", node.Name, err)
continue
}
if nodeGroup == nil {
if nodeGroup == nil || reflect.ValueOf(nodeGroup).IsNil() {
glog.V(4).Infof("Skipping %s - no node group config", node.Name)
continue
}
@ -173,7 +174,7 @@ func ScaleDown(
if err != nil {
return ScaleDownError, fmt.Errorf("failed to node group for %s: %v", nodeToRemove.Name, err)
}
if nodeGroup == nil {
if nodeGroup == nil || reflect.ValueOf(nodeGroup).IsNil() {
return ScaleDownError, fmt.Errorf("picked node that doesn't belong to a node group: %s", nodeToRemove.Name)
}

2
cluster-autoscaler/utils.go
View File

@ -163,7 +163,7 @@ func GetNodeInfosForGroups(nodes []*kube_api.Node, cloudProvider cloudprovider.C
if err != nil {
return map[string]*schedulercache.NodeInfo{}, err
}
if nodeGroup == nil {
if nodeGroup == nil || reflect.ValueOf(nodeGroup).IsNil() {
continue
}
id := nodeGroup.Id()