Remove event after apply and add jitter when requeue

Signed-off-by: Jian Qiu <[email protected]>

Author: qiujian16

pkg/work/spoke/apply/server_side_apply.go

@@ -115,9 +115,9 @@ func (c *ServerSideApply) Apply(
 		Namespace(required.GetNamespace()).
 		Apply(ctx, required.GetName(), required, metav1.ApplyOptions{FieldManager: fieldManager, Force: force})
 	resourceKey, _ := cache.MetaNamespaceKeyFunc(required)
-	recorder.Eventf(fmt.Sprintf(
-		"Server Side Applied %s %s", required.GetKind(), resourceKey),
-		"Patched with field manager %s, err %v", fieldManager, err)
+	logger.Info(
+		"Server Side Applied", "kind", required.GetKind(), "key", resourceKey,
+		"fieldManager", fieldManager, "error", err)
 
 	if errors.IsConflict(err) {
 		return obj, &ServerSideApplyConflictError{ssaErr: err}

pkg/work/spoke/controllers/manifestcontroller/appliedmanifestwork_reconciler.go

@@ -24,7 +24,7 @@ import (
 
 type appliedManifestWorkReconciler struct {
 	spokeDynamicClient dynamic.Interface
-	rateLimiter        workqueue.RateLimiter
+	rateLimiter        workqueue.TypedRateLimiter[string]
 }
 
 func (m *appliedManifestWorkReconciler) reconcile(

pkg/work/spoke/controllers/manifestcontroller/appliedmanifestwork_reconciler_test.go

@@ -241,7 +241,7 @@ func TestSyncManifestWork(t *testing.T) {
 				reconcilers: []workReconcile{
 					&appliedManifestWorkReconciler{
 						spokeDynamicClient: fakeDynamicClient,
-						rateLimiter:        workqueue.NewItemExponentialFailureRateLimiter(0, 1*time.Second),
+						rateLimiter:        workqueue.NewTypedItemExponentialFailureRateLimiter[string](0, 1*time.Second),
 					},
 				},
 				hubHash: "test",

pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller.go

@@ -13,6 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/workqueue"
@@ -91,7 +92,7 @@ func NewManifestWorkController(
 			},
 			&appliedManifestWorkReconciler{
 				spokeDynamicClient: spokeDynamicClient,
-				rateLimiter:        workqueue.NewItemExponentialFailureRateLimiter(5*time.Millisecond, 1000*time.Second),
+				rateLimiter:        workqueue.NewTypedItemExponentialFailureRateLimiter[string](5*time.Millisecond, 1000*time.Second),
 			},
 		},
 	}
@@ -145,7 +146,7 @@ func (m *ManifestWorkController) sync(ctx context.Context, controllerContext fac
 	}
 	newAppliedManifestWork := appliedManifestWork.DeepCopy()
 
-	var requeueTime = ResyncInterval
+	var requeueTime = wait.Jitter(ResyncInterval, 0.3)
 	var errs []error
 	for _, reconciler := range m.reconcilers {
 		manifestWork, newAppliedManifestWork, err = reconciler.reconcile(