Merge pull request #2957 from marwanad/cherry-pick-2096-1.14

Cherry-pick #2096: Fix potential SEGV in updateReadinessStat
kubernetes · Mar 27, 2020 · f6a94b7 · f6a94b7
2 parents f2b4a77 + 8591091
commit f6a94b7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cluster-autoscaler/clusterstate/clusterstate.go b/cluster-autoscaler/clusterstate/clusterstate.go
@@ -558,6 +558,10 @@ func (csr *ClusterStateRegistry) updateReadinessStats(currentTime time.Time) {
 			klog.Warningf("Failed to get nodegroup for %s: %v", unregistered.Node.Name, errNg)
 			continue
 		}
+		if nodeGroup == nil {
+			klog.Warningf("Nodegroup is nil for %s", unregistered.Node.Name)
+			continue
+		}
 		perNgCopy := perNodeGroup[nodeGroup.Id()]
 		if unregistered.UnregisteredSince.Add(csr.config.MaxNodeProvisionTime).Before(currentTime) {
 			perNgCopy.LongUnregistered++