Patch status instead of updating

Signed-off-by: ccremer <github.account@chrigel.net>

Author: ccremer

cmd/operator/main.go

@@ -4,26 +4,24 @@ import (
 	"fmt"
 	"strings"
 
+	k8upv1 "github.com/k8up-io/k8up/v2/api/v1"
+	"github.com/k8up-io/k8up/v2/cmd"
 	"github.com/k8up-io/k8up/v2/operator/archivecontroller"
 	"github.com/k8up-io/k8up/v2/operator/backupcontroller"
+	"github.com/k8up-io/k8up/v2/operator/cfg"
 	"github.com/k8up-io/k8up/v2/operator/checkcontroller"
+	"github.com/k8up-io/k8up/v2/operator/executor"
 	"github.com/k8up-io/k8up/v2/operator/jobcontroller"
 	"github.com/k8up-io/k8up/v2/operator/locker"
 	"github.com/k8up-io/k8up/v2/operator/prunecontroller"
 	"github.com/k8up-io/k8up/v2/operator/restorecontroller"
 	"github.com/k8up-io/k8up/v2/operator/schedulecontroller"
 	"github.com/urfave/cli/v2"
-	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
-
-	k8upv1 "github.com/k8up-io/k8up/v2/api/v1"
-	"github.com/k8up-io/k8up/v2/cmd"
-	"github.com/k8up-io/k8up/v2/operator/cfg"
-	"github.com/k8up-io/k8up/v2/operator/executor"
 )
 
 const (
@@ -144,7 +142,6 @@ func operatorMain(c *cli.Context) error {
 func k8upScheme() *runtime.Scheme {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(batchv1.AddToScheme(scheme))
 	utilruntime.Must(k8upv1.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme
 	return scheme

operator/executor/worker.go

@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"github.com/k8up-io/k8up/v2/operator/locker"
-	"k8s.io/apimachinery/pkg/api/errors"
-
 	"github.com/k8up-io/k8up/v2/operator/observer"
 	"github.com/k8up-io/k8up/v2/operator/queue"
 )
@@ -75,9 +73,7 @@ func (qe *QueueWorker) loopRepositoryJobs(repository string) {
 
 		err := job.Execute()
 		if err != nil {
-			if !errors.IsAlreadyExists(err) {
-				job.Logger().Error(err, "cannot create job", "repository", repository)
-			}
+			job.Logger().Error(err, "failed to execute", "repository", repository)
 		}
 
 		// Skip the rest for this repository if we just started an exclusive job.

operator/job/status.go

@@ -36,28 +36,22 @@ func (c *Config) SetConditionFalseWithMessage(condition k8upv1.ConditionType, re
 }
 
 // patchConditions patches the Status object on the K8s controller with the given Conditions
-func (c *Config) patchConditions(conditionStatus metav1.ConditionStatus, reason k8upv1.ConditionReason, message string, conditions ...k8upv1.ConditionType) {
-	runtimeObject := c.Obj
-	patch := client.MergeFrom(runtimeObject.DeepCopyObject().(client.Object))
-
+func (c *Config) patchConditions(conditionStatus metav1.ConditionStatus, reason k8upv1.ConditionReason, message string, condition k8upv1.ConditionType) {
 	status := c.Obj.GetStatus()
-
-	for _, condition := range conditions {
-		meta.SetStatusCondition(&status.Conditions, metav1.Condition{
-			Type:    condition.String(),
-			Status:  conditionStatus,
-			Message: message,
-			Reason:  reason.String(),
-		})
-	}
-
+	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
+		Type:    condition.String(),
+		Status:  conditionStatus,
+		Message: message,
+		Reason:  reason.String(),
+	})
 	c.Obj.SetStatus(status)
-	err := c.Client.Status().Patch(c.CTX, c.Obj.(client.Object), patch)
+
+	err := c.Client.Status().Update(c.CTX, c.Obj)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			return
 		}
-		c.Log.Error(err, "could not patch status conditions")
+		c.Log.Error(err, "could not patch status condition")
 	}
 }
 
@@ -68,12 +62,13 @@ func (c *Config) SetStarted(message string, args ...interface{}) {
 	status.SetStarted(fmt.Sprintf(message, args...))
 	c.Obj.SetStatus(status)
 
-	err := c.Client.Status().Update(c.CTX, c.Obj)
+	patch := client.MergeFrom(c.Obj.DeepCopyObject().(client.Object))
+	err := c.Client.Status().Patch(c.CTX, c.Obj, patch)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			return
 		}
-		c.Log.Error(err, "could not update status")
+		c.Log.Error(err, "could not patch status")
 	}
 }
 
@@ -83,12 +78,13 @@ func (c *Config) SetFinished(namespace, name string) {
 	status.SetFinished(fmt.Sprintf("the Job '%s/%s' ended", namespace, name))
 	c.Obj.SetStatus(status)
 
-	err := c.Client.Status().Update(c.CTX, c.Obj)
+	patch := client.MergeFrom(c.Obj.DeepCopyObject().(client.Object))
+	err := c.Client.Status().Patch(c.CTX, c.Obj, patch)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			return
 		}
-		c.Log.Error(err, "could not update status")
+		c.Log.Error(err, "could not patch status")
 	}
 }