Merge pull request #814 from flavianmissi/suspend-panic

openshift-merge-robot · web-flow · commit 115d07e3ebc0 · 2022-11-23T22:41:05.000-05:00
OCPBUGS-3974: check for nil pointer before dereferencing
diff --git a/pkg/operator/status.go b/pkg/operator/status.go
@@ -176,7 +176,7 @@ func (c *ImagePrunerController) syncPrunerStatus(cr *imageregistryv1.ImagePruner
 		updatePrunerCondition(cr, "Failed", prunerLastJobStatus)
 	}
 
-	if *cr.Spec.Suspend {
+	if cr.Spec.Suspend != nil && *cr.Spec.Suspend {
 		prunerJobScheduled := operatorapiv1.OperatorCondition{
 			Status:  operatorapiv1.ConditionFalse,
 			Message: "The pruner job has been suspended",

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (c ImagePrunerController) syncPrunerStatus(cr imageregistryv1.ImagePruner`
`176`	`176`	`updatePrunerCondition(cr, "Failed", prunerLastJobStatus)`
`177`	`177`	`}`
`178`	`178`
`179`		`- if *cr.Spec.Suspend {`
	`179`	`+ if cr.Spec.Suspend != nil && *cr.Spec.Suspend {`
`180`	`180`	`prunerJobScheduled := operatorapiv1.OperatorCondition{`
`181`	`181`	`Status: operatorapiv1.ConditionFalse,`
`182`	`182`	`Message: "The pruner job has been suspended",`