Merge pull request #2955 from weaveworks/fix-replicaset-desiredreplicas

fix incorrect reporting of replicaset DesiredReplicas
weaveworks · Dec 1, 2017 · 2f4c650 · 2f4c650
2 parents d6e47c0 + 914acf6
commit 2f4c650
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/probe/kubernetes/replica_set.go b/probe/kubernetes/replica_set.go
@@ -53,10 +53,15 @@ func (r *replicaSet) AddParent(topology, id string) {
 }
 
 func (r *replicaSet) GetNode(probeID string) report.Node {
+	// Spec.Replicas can be omitted, and the pointer will be nil. It defaults to 1.
+	desiredReplicas := 1
+	if r.Spec.Replicas != nil {
+		desiredReplicas = int(*r.Spec.Replicas)
+	}
 	return r.MetaNode(report.MakeReplicaSetNodeID(r.UID())).WithLatests(map[string]string{
 		ObservedGeneration:    fmt.Sprint(r.Status.ObservedGeneration),
 		Replicas:              fmt.Sprint(r.Status.Replicas),
-		DesiredReplicas:       fmt.Sprint(r.Spec.Replicas),
+		DesiredReplicas:       fmt.Sprint(desiredReplicas),
 		FullyLabeledReplicas:  fmt.Sprint(r.Status.FullyLabeledReplicas),
 		report.ControlProbeID: probeID,
 	}).WithParents(r.parents).WithLatestActiveControls(ScaleUp, ScaleDown)