github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

[Federation]Fix panic: index out of range

Browse Source 
When the number of clusterStatusNew's Conditions is different from
the number of clusterStatusOld's Conditions, clustercontroller
will panic. We should check it before comparing.
This commit is contained in:
FengyunPan 2017-04-16 19:40:16 +08:00
parent f05ce1e8f1
commit 8886574a67
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
federation/pkg/federation-controller/cluster/clustercontroller.go
View File

@ -192,13 +192,18 @@ func (cc *ClusterController) UpdateClusterStatus() error {
} else { } else {
hasTransition := false hasTransition := false
for i := 0; i < len(clusterStatusNew.Conditions); i++ { if len(clusterStatusNew.Conditions) != len(clusterStatusOld.Conditions) {
if !(strings.EqualFold(string(clusterStatusNew.Conditions[i].Type), string(clusterStatusOld.Conditions[i].Type)) && hasTransition = true
strings.EqualFold(string(clusterStatusNew.Conditions[i].Status), string(clusterStatusOld.Conditions[i].Status))) { } else {
hasTransition = true for i := 0; i < len(clusterStatusNew.Conditions); i++ {
break if !(strings.EqualFold(string(clusterStatusNew.Conditions[i].Type), string(clusterStatusOld.Conditions[i].Type)) &&
strings.EqualFold(string(clusterStatusNew.Conditions[i].Status), string(clusterStatusOld.Conditions[i].Status))) {
hasTransition = true
break
}
} }
} }
if !hasTransition { if !hasTransition {
for j := 0; j < len(clusterStatusNew.Conditions); j++ { for j := 0; j < len(clusterStatusNew.Conditions); j++ {
clusterStatusNew.Conditions[j].LastTransitionTime = clusterStatusOld.Conditions[j].LastTransitionTime clusterStatusNew.Conditions[j].LastTransitionTime = clusterStatusOld.Conditions[j].LastTransitionTime
@ -207,7 +212,7 @@ func (cc *ClusterController) UpdateClusterStatus() error {
} }
clusterClient, found := cc.clusterKubeClientMap[cluster.Name] clusterClient, found := cc.clusterKubeClientMap[cluster.Name]
if !found { if !found {
glog.Warningf("Failed to client for cluster %s", cluster.Name) glog.Warningf("Failed to get client for cluster %s", cluster.Name)
continue continue
} }