Merge pull request kubernetes-retired#693 from mwielgus/fix-npe

Fix nil pointer reference panic in kube_nodes
perhapszzy · Nov 6, 2015 · 0b42d6f · 0b42d6f
2 parents ad35589 + 0803331
commit 0b42d6f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/sources/kube_nodes.go b/sources/kube_nodes.go
@@ -84,11 +84,13 @@ func (self *kubeNodeMetrics) updateStats(host nodes.Host, info nodes.Info, start
 		hostCopy := containers[hostIndex]
 		hostContainer = &hostCopy
 		containers = append(containers[:hostIndex], containers[hostIndex+1:]...)
+		// This is temporary workaround for #399. To make unit consistent with cadvisor normalize to a conversion factor of 1024.
+		hostContainer.Spec.Cpu.Limit = info.CpuCapacity * 1024 / 1000
+		hostContainer.Spec.Memory.Limit = info.MemCapacity
+		return hostContainer, containers, nil
+	} else {
+		return nil, []api.Container{}, fmt.Errorf("Host container not found")
 	}
-	// This is temporary workaround for #399. To make unit consistent with cadvisor normalize to a conversion factor of 1024.
-	hostContainer.Spec.Cpu.Limit = info.CpuCapacity * 1024 / 1000
-	hostContainer.Spec.Memory.Limit = info.MemCapacity
-	return hostContainer, containers, nil
 }
 
 // Returns the host containers, non-Kubernetes containers, and an error (if any).