Rename to fakeSyncContext

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

Author: qiujian16

pkg/addon/controllers/addonconfiguration/controller_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 	"time"
-	
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/cache"
@@ -234,7 +234,7 @@ func TestAddonConfigurationControllerSync(t *testing.T) {
 			}
 
 			// Create sync context
-			syncCtx := testingcommon.NewFakeSDKSyncContext(t, c.queueKey)
+			syncCtx := testingcommon.NewFakeSyncContext(t, c.queueKey)
 
 			// Test sync method
 			ctx := context.TODO()

pkg/addon/controllers/addonmanagement/controller_test.go

@@ -463,7 +463,7 @@ func TestAddonManagementControllerSync(t *testing.T) {
 			}
 
 			// Create sync context
-			syncCtx := testingcommon.NewFakeSDKSyncContext(t, c.queueKey)
+			syncCtx := testingcommon.NewFakeSyncContext(t, c.queueKey)
 
 			// Test sync method
 			ctx := context.TODO()

pkg/addon/controllers/addonowner/controller_test.go

@@ -74,7 +74,7 @@ func TestReconcile(t *testing.T) {
 				}
 			}
 
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, c.syncKey)
+			syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
 
 			controller := NewAddonOwnerController(
 				fakeAddonClient,

pkg/addon/controllers/addonprogressing/controller_test.go

@@ -735,7 +735,7 @@ func TestReconcile(t *testing.T) {
 				}
 			}
 
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, c.syncKey)
+			syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
 
 			controller := NewAddonProgressingController(
 				fakeAddonClient,
@@ -1461,7 +1461,7 @@ func TestReconcileHostedAddons(t *testing.T) {
 				}
 			}
 
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, c.syncKey)
+			syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
 
 			controller := NewAddonProgressingController(
 				fakeAddonClient,

pkg/addon/controllers/addontemplate/controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/openshift/library-go/pkg/operator/events"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -51,7 +50,6 @@ type addonTemplateController struct {
 	dynamicInformers           dynamicinformer.DynamicSharedInformerFactory
 	workInformers              workv1informers.SharedInformerFactory
 	runControllerFunc          runController
-	eventRecorder              events.Recorder
 }
 
 type runController func(ctx context.Context, addonName string) error
@@ -66,7 +64,6 @@ func NewAddonTemplateController(
 	clusterInformers clusterv1informers.SharedInformerFactory,
 	dynamicInformers dynamicinformer.DynamicSharedInformerFactory,
 	workInformers workv1informers.SharedInformerFactory,
-	recorder events.Recorder,
 	runController ...runController,
 ) factory.Controller {
 	c := &addonTemplateController{
@@ -81,7 +78,6 @@ func NewAddonTemplateController(
 		clusterInformers:           clusterInformers,
 		dynamicInformers:           dynamicInformers,
 		workInformers:              workInformers,
-		eventRecorder:              recorder,
 	}
 
 	if len(runController) > 0 {
@@ -235,7 +231,6 @@ func (c *addonTemplateController) runController(ctx context.Context, addonName s
 		c.addonClient,
 		c.addonInformers, // use the shared informers, whose cache is synced already
 		kubeInformers.Rbac().V1().RoleBindings().Lister(),
-		c.eventRecorder,
 		// image overrides from cluster annotation has lower priority than from the addonDeploymentConfig
 		getValuesClosure,
 		addonfactory.GetAddOnDeploymentConfigValues(

pkg/addon/controllers/addontemplate/controller_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/openshift/library-go/pkg/operator/events/eventstesting"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic/dynamicinformer"
@@ -193,12 +192,11 @@ func TestReconcile(t *testing.T) {
 			clusterInformers,
 			dynamicInformerFactory,
 			workInformers,
-			eventstesting.NewTestingEventRecorder(t),
 			runController,
 		)
 		ctx := context.TODO()
 		for _, syncKey := range c.syncKeys {
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, syncKey)
+			syncContext := testingcommon.NewFakeSyncContext(t, syncKey)
 			err := controller.Sync(ctx, syncContext, syncKey)
 			if err != nil {
 				t.Errorf("expected no error when sync: %v", err)
@@ -383,15 +381,14 @@ func TestStopUnusedManagers(t *testing.T) {
 				clusterInformers:           clusterInformers,
 				dynamicInformers:           dynamicInformerFactory,
 				workInformers:              workInformers,
-				eventRecorder:              eventstesting.NewTestingEventRecorder(t),
 			}
 
 			// Start informers and wait for cache sync
 			ctx := context.TODO()
 			addonInformers.Start(ctx.Done())
 			addonInformers.WaitForCacheSync(ctx.Done())
 
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, c.addonName)
+			syncContext := testingcommon.NewFakeSyncContext(t, c.addonName)
 
 			err = controller.stopUnusedManagers(ctx, syncContext, c.addonName)
 			assert.NoError(t, err)

pkg/addon/controllers/cmainstallprogression/controller_test.go

@@ -339,7 +339,7 @@ func TestReconcile(t *testing.T) {
 				}
 			}
 
-			syncContext := testingcommon.NewFakeSDKSyncContext(t, c.syncKey)
+			syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
 
 			controller := NewCMAInstallProgressionController(
 				fakeAddonClient,

pkg/addon/manager.go

@@ -182,7 +182,6 @@ func RunControllerManagerWithInformers(
 		// these addons only support addontemplate and addondeploymentconfig
 		dynamicInformers,
 		workinformers,
-		controllerContext.EventRecorder,
 	)
 
 	go addonManagementController.Run(ctx, 2)

pkg/addon/templateagent/registration.go

@@ -23,6 +23,9 @@ import (
 	"open-cluster-management.io/addon-framework/pkg/utils"
 	addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
+	"open-cluster-management.io/sdk-go/pkg/basecontroller/events"
+
+	commonrecorder "open-cluster-management.io/ocm/pkg/common/recorder"
 )
 
 const (
@@ -471,8 +474,14 @@ func (a *CRDTemplateAgentAddon) createPermissionBinding(clusterName, addonName,
 		binding.OwnerReferences = []metav1.OwnerReference{*owner}
 	}
 
+	// TODO(qiujian16) this should have ctx passed to build the wrapper
+	recorderWrapper := commonrecorder.NewEventsRecorderWrapper(
+		context.Background(),
+		events.NewContextualLoggingEventRecorder(fmt.Sprintf("addontemplate-%s-%s", clusterName, addonName)),
+	)
+
 	_, modified, err := resourceapply.ApplyRoleBinding(context.TODO(),
-		a.hubKubeClient.RbacV1(), a.eventRecorder, binding)
+		a.hubKubeClient.RbacV1(), recorderWrapper, binding)
 	if err == nil && modified {
 		a.logger.Info("Rolebinding for addon updated", "namespace", binding.Namespace, "name", binding.Name,
 			"clusterName", clusterName, "addonName", addonName)

pkg/addon/templateagent/registration_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/openshift/library-go/pkg/operator/events/eventstesting"
 	"github.com/stretchr/testify/assert"
 	certificatesv1 "k8s.io/api/certificates/v1"
 	certificates "k8s.io/api/certificates/v1beta1"
@@ -739,7 +738,7 @@ func TestTemplatePermissionConfigFunc(t *testing.T) {
 		}
 
 		agent := NewCRDTemplateAgentAddon(ctx, c.addon.Name, hubKubeClient, addonClient, addonInformerFactory,
-			kubeInformers.Rbac().V1().RoleBindings().Lister(), eventstesting.NewTestingEventRecorder(t))
+			kubeInformers.Rbac().V1().RoleBindings().Lister())
 		f := agent.TemplatePermissionConfigFunc()
 		err := f(c.cluster, c.addon)
 		if err != c.expectedErr {