change workload controller to use patch instead of update

Signed-off-by: zhihao jian <zhihao.jian@shopee.com>

fix test

use MergeFrom func to patch data

Author: zhihao jian

pkg/controller/deployment/controller.go

@@ -107,6 +107,7 @@ func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) {
 	// Deployment controller factory
 	factory := &controllerFactory{
 		client:           genericClient.KubeClient,
+		runtimeClient:    mgr.GetClient(),
 		eventBroadcaster: eventBroadcaster,
 		eventRecorder:    recorder,
 		dLister:          dLister,
@@ -268,6 +269,7 @@ func (f *controllerFactory) NewController(deployment *appsv1.Deployment) *Deploy
 
 	return &DeploymentController{
 		client:           f.client,
+		runtimeClient:    f.runtimeClient,
 		eventBroadcaster: f.eventBroadcaster,
 		eventRecorder:    f.eventRecorder,
 		dLister:          f.dLister,

pkg/controller/deployment/deployment_controller.go

@@ -39,6 +39,7 @@ import (
 
 	rolloutsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 	deploymentutil "github.com/openkruise/rollouts/pkg/controller/deployment/util"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
@@ -68,6 +69,8 @@ type DeploymentController struct {
 
 	// we will use this strategy to replace spec.strategy of deployment
 	strategy rolloutsv1alpha1.DeploymentStrategy
+
+	runtimeClient client.Client
 }
 
 // getReplicaSetsForDeployment uses ControllerRefManager to reconcile

pkg/controller/deployment/sync.go

@@ -30,6 +30,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/integer"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	rolloutsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 	deploymentutil "github.com/openkruise/rollouts/pkg/controller/deployment/util"
@@ -118,7 +119,14 @@ func (dc *DeploymentController) getNewReplicaSet(ctx context.Context, d *apps.De
 		minReadySecondsNeedsUpdate := rsCopy.Spec.MinReadySeconds != d.Spec.MinReadySeconds
 		if annotationsUpdated || minReadySecondsNeedsUpdate {
 			rsCopy.Spec.MinReadySeconds = d.Spec.MinReadySeconds
-			return dc.client.AppsV1().ReplicaSets(rsCopy.ObjectMeta.Namespace).Update(ctx, rsCopy, metav1.UpdateOptions{})
+
+			// Use controller-runtime's MergeFrom for more concise and resilient patching
+			// This automatically handles strategic merge patches and is more maintainable
+			err := dc.runtimeClient.Patch(ctx, rsCopy, client.MergeFrom(existingNewRS))
+			if err != nil {
+				return nil, err
+			}
+			return rsCopy, nil
 		}
 
 		// Should use the revision in existingNewRS's annotation, since it set by before
@@ -410,11 +418,29 @@ func (dc *DeploymentController) scaleReplicaSet(ctx context.Context, rs *apps.Re
 	var err error
 	if sizeNeedsUpdate || annotationsNeedUpdate {
 		oldScale := *(rs.Spec.Replicas)
+
+		// Create a copy to modify without affecting the original
 		rsCopy := rs.DeepCopy()
-		*(rsCopy.Spec.Replicas) = newScale
-		deploymentutil.SetReplicasAnnotations(rsCopy, *(deployment.Spec.Replicas), *(deployment.Spec.Replicas)+deploymentutil.MaxSurge(deployment, &dc.strategy))
-		rs, err = dc.client.AppsV1().ReplicaSets(rsCopy.Namespace).Update(ctx, rsCopy, metav1.UpdateOptions{})
-		if err == nil && sizeNeedsUpdate {
+
+		if sizeNeedsUpdate {
+			rsCopy.Spec.Replicas = &newScale
+		}
+		if annotationsNeedUpdate {
+			// Set the annotations that need to be updated
+			desiredReplicas := *(deployment.Spec.Replicas)
+			maxReplicas := *(deployment.Spec.Replicas) + deploymentutil.MaxSurge(deployment, &dc.strategy)
+			deploymentutil.SetReplicasAnnotations(rsCopy, desiredReplicas, maxReplicas)
+		}
+
+		// Use controller-runtime's MergeFrom for more concise and resilient patching
+		// This automatically handles strategic merge patches and is more maintainable
+		err = dc.runtimeClient.Patch(ctx, rsCopy, client.MergeFrom(rs))
+		if err != nil {
+			return scaled, rs, err
+		}
+
+		rs = rsCopy
+		if sizeNeedsUpdate {
 			scaled = true
 			dc.eventRecorder.Eventf(deployment, v1.EventTypeNormal, "ScalingReplicaSet", "Scaled %s replica set %s to %d from %d", scalingOperation, rs.Name, newScale, oldScale)
 		}

pkg/util/patch/patch_utils_test.go

@@ -41,5 +41,4 @@ func TestCommonPatch(t *testing.T) {
 	if !reflect.DeepEqual(patchReq.String(), expectedPatchBody) {
 		t.Fatalf("Not equal: \n%s \n%s", expectedPatchBody, patchReq.String())
 	}
-
 }