Merge pull request #318 from openshift-cherrypick-robot/cherry-pick-3…

…09-to-stable [stable] fix: add nil checks to prevent unit tests from failing
opendatahub-io · Apr 12, 2024 · 65e3e96 · 65e3e96
2 parents b2c108e + 4f29d67
commit 65e3e96
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/components/notebook-controller/controllers/notebook_controller.go b/components/notebook-controller/controllers/notebook_controller.go
@@ -162,7 +162,7 @@ func (r *NotebookReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 	// Copy the pod template labels, but reconcilation is not required
 	// exclusively based on ths pod template labels
-	if *ss.Spec.Replicas != *foundStateful.Spec.Replicas {
+	if ss.Spec.Replicas != nil && foundStateful.Spec.Replicas != nil && *ss.Spec.Replicas != *foundStateful.Spec.Replicas {
 		if !reflect.DeepEqual(foundStateful.Spec.Template.ObjectMeta.Labels, ss.Spec.Template.ObjectMeta.Labels) {
 			foundStateful.Spec.Template.ObjectMeta.Labels = ss.Spec.Template.ObjectMeta.Labels
 		}