From 71236758c11cbffb91166b3f795e1bbefa7f2292 Mon Sep 17 00:00:00 2001 From: Jian Zhu Date: Sun, 13 Jul 2025 21:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B1=20Send=20an=20event=20for=20evicti?= =?UTF-8?q?ng=20appliedmanifestwork=20(#1066)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Increase the log level for evicting appliedmanifestwork Signed-off-by: zhujian * Add an event for evicting appliedmanifestwork Signed-off-by: zhujian --------- Signed-off-by: zhujian --- .../unmanaged_appliedmanifestwork_controller.go | 11 +++++++++-- .../unmanaged_appliedmanifestwork_controller_test.go | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go index 7e5ecec3a..e604f30ab 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go +++ b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go @@ -33,6 +33,7 @@ const ( ) type unmanagedAppliedWorkController struct { + recorder events.Recorder manifestWorkLister worklister.ManifestWorkNamespaceLister appliedManifestWorkClient workv1client.AppliedManifestWorkInterface patcher patcher.Patcher[*workapiv1.AppliedManifestWork, workapiv1.AppliedManifestWorkSpec, workapiv1.AppliedManifestWorkStatus] @@ -62,6 +63,7 @@ func NewUnManagedAppliedWorkController( hubHash, agentID string, ) factory.Controller { controller := &unmanagedAppliedWorkController{ + recorder: recorder, manifestWorkLister: manifestWorkLister, appliedManifestWorkClient: appliedManifestWorkClient, patcher: patcher.NewPatcher[ @@ -136,8 +138,13 @@ func (m *unmanagedAppliedWorkController) evictAppliedManifestWork(ctx context.Co return nil } - klog.V(2).Infof("Delete appliedWork %s by agent %s after eviction grace periodby", appliedManifestWork.Name, m.agentID) - return m.appliedManifestWorkClient.Delete(ctx, appliedManifestWork.Name, metav1.DeleteOptions{}) + err := m.appliedManifestWorkClient.Delete(ctx, appliedManifestWork.Name, metav1.DeleteOptions{}) + if err != nil { + return err + } + m.recorder.Eventf("AppliedManifestWorkEvicted", appliedManifestWork.Name, + "AppliedManifestWork %s evicted by agent %s after eviction grace period", appliedManifestWork.Name, m.agentID) + return nil } func (m *unmanagedAppliedWorkController) stopToEvictAppliedManifestWork( diff --git a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go index 8f1b2231d..aef7bbdbc 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go +++ b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "github.com/openshift/library-go/pkg/operator/events/eventstesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" @@ -253,6 +254,7 @@ func TestSyncUnamanagedAppliedWork(t *testing.T) { } controller := &unmanagedAppliedWorkController{ + recorder: eventstesting.NewTestingEventRecorder(t), manifestWorkLister: informerFactory.Work().V1().ManifestWorks().Lister().ManifestWorks("test"), appliedManifestWorkClient: fakeClient.WorkV1().AppliedManifestWorks(), patcher: patcher.NewPatcher[