Skip to content

Commit 439d48e

Browse files
committed
feat: reconciler_factory is using a golang-commons logger now
1 parent fb7fd72 commit 439d48e

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

listener/kcp/reconciler_factory.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"sigs.k8s.io/controller-runtime/pkg/client"
1313
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1414

15+
"github.com/openmfp/golang-commons/logger"
1516
"github.com/openmfp/kubernetes-graphql-gateway/common/config"
1617
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
1718
"github.com/openmfp/kubernetes-graphql-gateway/listener/clusterpath"
@@ -51,9 +52,11 @@ type ReconcilerOpts struct {
5152
func NewReconciler(appCfg config.Config, opts ReconcilerOpts, restcfg *rest.Config,
5253
discoveryInterface discovery.DiscoveryInterface,
5354
preReconcileFunc func(cr *apischema.CRDResolver, io workspacefile.IOHandler) error,
54-
discoverFactory func(cfg *rest.Config) (*discoveryclient.FactoryProvider, error)) (CustomReconciler, error) {
55+
discoverFactory func(cfg *rest.Config) (*discoveryclient.FactoryProvider, error),
56+
log *logger.Logger,
57+
) (CustomReconciler, error) {
5558
if !appCfg.EnableKcp {
56-
return newStandardReconciler(opts, discoveryInterface, preReconcileFunc)
59+
return newStandardReconciler(opts, discoveryInterface, preReconcileFunc, log)
5760
}
5861

5962
return newKcpReconciler(opts, restcfg, discoverFactory)
@@ -63,6 +66,7 @@ func newStandardReconciler(
6366
opts ReconcilerOpts,
6467
discoveryInterface discovery.DiscoveryInterface,
6568
preReconcileFunc func(cr *apischema.CRDResolver, io workspacefile.IOHandler) error,
69+
log *logger.Logger,
6670
) (CustomReconciler, error) {
6771
ioHandler, err := workspacefile.NewIOHandler(opts.OpenAPIDefinitionsPath)
6872
if err != nil {
@@ -83,7 +87,7 @@ func newStandardReconciler(
8387
return nil, errors.Join(ErrGenerateSchema, err)
8488
}
8589

86-
return controller.NewCRDReconciler(kubernetesClusterName, opts.Client, schemaResolver, ioHandler), nil
90+
return controller.NewCRDReconciler(kubernetesClusterName, opts.Client, schemaResolver, ioHandler, log), nil
8791
}
8892

8993
func restMapperFromConfig(cfg *rest.Config) (meta.RESTMapper, error) {
@@ -130,7 +134,8 @@ func newKcpReconciler(opts ReconcilerOpts, restcfg *rest.Config, newDiscoveryFac
130134
return nil, errors.Join(ErrCreateDiscoveryClient, err)
131135
}
132136

137+
// TODO: pass logger here as well if needed by APIBindingReconciler?
133138
return controller.NewAPIBindingReconciler(
134-
ioHandler, df, apischema.NewResolver(), pr,
139+
ioHandler, df, apischema.NewResolver(), pr /* log */, nil,
135140
), nil
136141
}

listener/kcp/reconciler_factory_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"k8s.io/client-go/rest"
1616
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1717

18+
"github.com/openmfp/golang-commons/logger"
1819
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
1920
"github.com/openmfp/kubernetes-graphql-gateway/listener/discoveryclient"
2021
"github.com/openmfp/kubernetes-graphql-gateway/listener/workspacefile"
@@ -80,6 +81,11 @@ func TestNewReconciler(t *testing.T) {
8081

8182
fakeClient := fake.NewClientBuilder().WithScheme(scheme).Build()
8283

84+
loggerCfg := logger.DefaultConfig()
85+
loggerCfg.Name = "test-reconciler"
86+
log, err := logger.New(loggerCfg)
87+
assert.NoError(t, err)
88+
8389
reconciler, err := NewReconciler(appCfg, ReconcilerOpts{
8490
Config: tc.cfg,
8591
Scheme: scheme,
@@ -91,7 +97,7 @@ func TestNewReconciler(t *testing.T) {
9197
return &discoveryclient.FactoryProvider{
9298
Config: cfg,
9399
}, nil
94-
})
100+
}, log)
95101

96102
if tc.err != nil {
97103
assert.EqualError(t, err, tc.err.Error())

0 commit comments

Comments
 (0)