Merge pull request #1064 from weaveworks/issue/1062-npe-statefulset

Avoid NPE while dereferencing statefulset status
fluxcd · May 4, 2018 · cb31f1a · cb31f1a
2 parents d07783f + 52a7688
commit cb31f1a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cluster/kubernetes/resourcekinds.go b/cluster/kubernetes/resourcekinds.go
@@ -209,7 +209,8 @@ func (dk *statefulSetKind) getPodControllers(c *Cluster, namespace string) ([]po
 func makeStatefulSetPodController(statefulSet *apiapps.StatefulSet) podController {
 	var status string
 	objectMeta, statefulSetStatus := statefulSet.ObjectMeta, statefulSet.Status
-	if *statefulSetStatus.ObservedGeneration >= objectMeta.Generation {
+	// The type of ObservedGeneration is *int64, unlike other controllers.
+	if statefulSetStatus.ObservedGeneration != nil && *statefulSetStatus.ObservedGeneration >= objectMeta.Generation {
 		// the definition has been updated; now let's see about the replicas
 		updated, wanted := statefulSetStatus.UpdatedReplicas, *statefulSet.Spec.Replicas
 		if updated == wanted {