Use Patch instead of Update

linode · Dec 16, 2024 · 4b68ad4 · 4b68ad4
1 parent 1397dd4
commit 4b68ad4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/controller/bucket/helpers.go b/internal/controller/bucket/helpers.go
@@ -15,6 +15,7 @@ import (
 	"github.com/linode/provider-ceph/internal/consts"
 	"github.com/linode/provider-ceph/internal/utils"
 	"go.opentelemetry.io/otel"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -273,12 +274,13 @@ func (c *external) updateBucketCR(ctx context.Context, bucket *v1alpha1.Bucket,
 			if err := c.kubeClient.Get(ctx, nn, bucket); err != nil {
 				return err
 			}
-
-			switch cb(bucketDeepCopy, bucket) {
+			newCopy := bucket.DeepCopy()
+			updateRequired := cb(bucketDeepCopy, bucket)
+			switch updateRequired {
 			case NeedsStatusUpdate:
-				return c.kubeClient.Status().Update(ctx, bucket)
+				return c.kubeClient.Status().Patch(ctx, bucket, client.MergeFrom(newCopy))
 			case NeedsObjectUpdate:
-				return c.kubeClient.Update(ctx, bucket)
+				return c.kubeClient.Patch(ctx, bucket, client.MergeFrom(newCopy))
 			default:
 				return nil
 			}