github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-22 09:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🌱 use SDK basecontroller for better logging. (#1269)

Browse Source 
* Use basecontroller in sdk-go instead for better logging

Signed-off-by: Jian Qiu <jqiu@redhat.com>

* Rename to fakeSyncContext

Signed-off-by: Jian Qiu <jqiu@redhat.com>

---------

Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2025-12-01 11:07:02 +08:00
committed by GitHub
parent 26edb9423a
commit 33310619d9
199 changed files with 794 additions and 3268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/addon/controllers/addonprogressing/controller.go
View File

@@ -6,8 +6,6 @@ import (
"fmt"
"strings"
"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/events"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
@@ -27,6 +25,7 @@ import (
workinformers "open-cluster-management.io/api/client/work/informers/externalversions/work/v1"
worklister "open-cluster-management.io/api/client/work/listers/work/v1"
workapiv1 "open-cluster-management.io/api/work/v1"
"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
"open-cluster-management.io/sdk-go/pkg/patcher"
addonindex "open-cluster-management.io/ocm/pkg/addon/index"
@@ -49,7 +48,6 @@ func NewAddonProgressingController(
clusterManagementAddonInformers addoninformerv1alpha1.ClusterManagementAddOnInformer,
workInformers workinformers.ManifestWorkInformer,
addonFilterFunc factory.EventFilterFunc,
recorder events.Recorder,
) factory.Controller {
c := &addonProgressingController{
addonClient: addonClient,
@@ -79,13 +77,12 @@ func NewAddonProgressingController(
return len(accessor.GetLabels()) > 0 && len(accessor.GetLabels()[addonapiv1alpha1.AddonLabelKey]) > 0
},
workInformers.Informer()).
WithSync(c.sync).ToController("addon-progressing-controller", recorder)
WithSync(c.sync).ToController("addon-progressing-controller")
}
func (c *addonProgressingController) sync(ctx context.Context, syncCtx factory.SyncContext) error {
logger := klog.FromContext(ctx)
key := syncCtx.QueueKey()
logger.V(4).Info("Reconciling addon", "addon", key)
func (c *addonProgressingController) sync(ctx context.Context, syncCtx factory.SyncContext, key string) error {
logger := klog.FromContext(ctx).WithValues("addonName", key)
logger.V(4).Info("Reconciling addon")
namespace, addonName, err := cache.SplitMetaNamespaceKey(key)
if err != nil {

8
pkg/addon/controllers/addonprogressing/controller_test.go
View File

@@ -736,7 +736,6 @@ func TestReconcile(t *testing.T) {
}
syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
recorder := syncContext.Recorder()
controller := NewAddonProgressingController(
fakeAddonClient,
@@ -744,10 +743,9 @@ func TestReconcile(t *testing.T) {
addonInformers.Addon().V1alpha1().ClusterManagementAddOns(),
workInformers.Work().V1().ManifestWorks(),
utils.ManagedByAddonManager,
recorder,
)
err := controller.Sync(context.TODO(), syncContext)
err := controller.Sync(context.TODO(), syncContext, c.syncKey)
if err != nil {
t.Errorf("expected no error when sync: %v", err)
}
@@ -1464,7 +1462,6 @@ func TestReconcileHostedAddons(t *testing.T) {
}
syncContext := testingcommon.NewFakeSyncContext(t, c.syncKey)
recorder := syncContext.Recorder()
controller := NewAddonProgressingController(
fakeAddonClient,
@@ -1472,10 +1469,9 @@ func TestReconcileHostedAddons(t *testing.T) {
addonInformers.Addon().V1alpha1().ClusterManagementAddOns(),
workInformers.Work().V1().ManifestWorks(),
utils.ManagedByAddonManager,
recorder,
)
err := controller.Sync(context.TODO(), syncContext)
err := controller.Sync(context.TODO(), syncContext, c.syncKey)
if err != nil {
t.Errorf("expected no error when sync: %v", err)
}