@@ -12,6 +12,7 @@ import (
12
12
"sigs.k8s.io/controller-runtime/pkg/client"
13
13
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
14
14
15
+ "github.com/openmfp/golang-commons/logger"
15
16
"github.com/openmfp/kubernetes-graphql-gateway/common/config"
16
17
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
17
18
"github.com/openmfp/kubernetes-graphql-gateway/listener/clusterpath"
@@ -51,9 +52,11 @@ type ReconcilerOpts struct {
51
52
func NewReconciler (appCfg config.Config , opts ReconcilerOpts , restcfg * rest.Config ,
52
53
discoveryInterface discovery.DiscoveryInterface ,
53
54
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 ) {
55
58
if ! appCfg .EnableKcp {
56
- return newStandardReconciler (opts , discoveryInterface , preReconcileFunc )
59
+ return newStandardReconciler (opts , discoveryInterface , preReconcileFunc , log )
57
60
}
58
61
59
62
return newKcpReconciler (opts , restcfg , discoverFactory )
@@ -63,6 +66,7 @@ func newStandardReconciler(
63
66
opts ReconcilerOpts ,
64
67
discoveryInterface discovery.DiscoveryInterface ,
65
68
preReconcileFunc func (cr * apischema.CRDResolver , io workspacefile.IOHandler ) error ,
69
+ log * logger.Logger ,
66
70
) (CustomReconciler , error ) {
67
71
ioHandler , err := workspacefile .NewIOHandler (opts .OpenAPIDefinitionsPath )
68
72
if err != nil {
@@ -83,7 +87,7 @@ func newStandardReconciler(
83
87
return nil , errors .Join (ErrGenerateSchema , err )
84
88
}
85
89
86
- return controller .NewCRDReconciler (kubernetesClusterName , opts .Client , schemaResolver , ioHandler ), nil
90
+ return controller .NewCRDReconciler (kubernetesClusterName , opts .Client , schemaResolver , ioHandler , log ), nil
87
91
}
88
92
89
93
func restMapperFromConfig (cfg * rest.Config ) (meta.RESTMapper , error ) {
@@ -130,7 +134,8 @@ func newKcpReconciler(opts ReconcilerOpts, restcfg *rest.Config, newDiscoveryFac
130
134
return nil , errors .Join (ErrCreateDiscoveryClient , err )
131
135
}
132
136
137
+ // TODO: pass logger here as well if needed by APIBindingReconciler?
133
138
return controller .NewAPIBindingReconciler (
134
- ioHandler , df , apischema .NewResolver (), pr ,
139
+ ioHandler , df , apischema .NewResolver (), pr /* log */ , nil ,
135
140
), nil
136
141
}
0 commit comments