With status as patch and get

ngrok · Dec 19, 2024 · 663a3c2 · 663a3c2
1 parent da0caa7
commit 663a3c2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/internal/controller/base_controller.go b/internal/controller/base_controller.go
@@ -141,7 +141,14 @@ func (self *BaseController[T]) handleErr(op BaseControllerOp, obj T, err error)
 func (self *BaseController[T]) ReconcileStatus(ctx context.Context, obj T, origErr error) error {
 	log := ctrl.LoggerFrom(ctx).WithValues("originalError", origErr)
 
-	if err := self.Kube.Status().Patch(ctx, obj, client.MergeFrom(obj)); err != nil {
+	var currentObj T
+	if err := self.Kube.Get(ctx, client.ObjectKeyFromObject(obj), currentObj); err != nil {
+		self.Recorder.Event(obj, v1.EventTypeWarning, "StatusError", fmt.Sprintf("Failed to retrieve existing object for status update: %s", err.Error()))
+		log.V(1).Error(err, "Failed to retrieve existing object for status update")
+		return StatusError{origErr, err}
+	}
+
+	if err := self.Kube.Status().Patch(ctx, obj, client.MergeFrom(currentObj)); err != nil {
 		self.Recorder.Event(obj, v1.EventTypeWarning, "StatusError", fmt.Sprintf("Failed to reconcile status: %s", err.Error()))
 		log.V(1).Error(err, "Failed to patch status")
 		return StatusError{origErr, err}