Merge pull request #1290 from zimnx/mz/1287-service-panic-1.9

[v1.9] Fix panic in Operator occuring during node replacement
scylladb · Jun 27, 2023 · 8083150 · 8083150
2 parents 57a2b85 + 914eb58
commit 8083150
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/controller/scyllacluster/sync_services.go b/pkg/controller/scyllacluster/sync_services.go
@@ -360,13 +360,13 @@ func (scc *Controller) syncServices(
 
 				klog.V(2).InfoS("Pod has not been recreated by the StatefulSet controller yet",
 					"ScyllaCluster", klog.KObj(sc),
-					"Pod", klog.KObj(pod),
+					"Pod", klog.KObj(svc),
 				)
 				progressingConditions = append(progressingConditions, metav1.Condition{
 					Type:               serviceControllerProgressingCondition,
 					Status:             metav1.ConditionTrue,
 					Reason:             "WaitingForPodRecreation",
-					Message:            fmt.Sprintf("Service %q is waiting for StatefulSet controller to recreate pod %q.", naming.ObjRef(svc), naming.ObjRef(pod)),
+					Message:            fmt.Sprintf("Service %q is waiting for StatefulSet controller to recreate pod.", naming.ObjRef(svc)),
 					ObservedGeneration: sc.Generation,
 				})
 			} else {