@@ -5,14 +5,14 @@ import (
5
5
"context"
6
6
"errors"
7
7
8
+ "github.com/openmfp/golang-commons/logger"
8
9
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
9
10
"github.com/openmfp/kubernetes-graphql-gateway/listener/workspacefile"
10
11
11
12
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
12
13
apierrors "k8s.io/apimachinery/pkg/api/errors"
13
14
ctrl "sigs.k8s.io/controller-runtime"
14
15
"sigs.k8s.io/controller-runtime/pkg/client"
15
- "sigs.k8s.io/controller-runtime/pkg/log"
16
16
)
17
17
18
18
var (
@@ -27,34 +27,37 @@ type CRDReconciler struct {
27
27
ClusterName string
28
28
client.Client
29
29
* apischema.CRDResolver
30
- io workspacefile.IOHandler
30
+ io workspacefile.IOHandler
31
+ log * logger.Logger
31
32
}
32
33
33
34
func NewCRDReconciler (name string ,
34
35
clt client.Client ,
35
36
cr * apischema.CRDResolver ,
36
37
io workspacefile.IOHandler ,
38
+ log * logger.Logger ,
37
39
) * CRDReconciler {
38
40
return & CRDReconciler {
39
41
ClusterName : name ,
40
42
Client : clt ,
41
43
CRDResolver : cr ,
42
44
io : io ,
45
+ log : log ,
43
46
}
44
47
}
45
48
46
49
func (r * CRDReconciler ) Reconcile (ctx context.Context , req ctrl.Request ) (ctrl.Result , error ) {
47
- logger := log .FromContext ( ctx ). WithValues ("cluster" , r .ClusterName ).WithName ( req .Name )
48
- logger .Info ("starting reconciliation..." )
50
+ logger := r . log .With (). Str ("cluster" , r .ClusterName ).Str ( "name" , req .Name ). Logger ( )
51
+ logger .Info (). Msg ( "starting reconciliation..." )
49
52
50
53
crd := & apiextensionsv1.CustomResourceDefinition {}
51
54
err := r .Client .Get (ctx , req .NamespacedName , crd )
52
55
if apierrors .IsNotFound (err ) {
53
- logger .Info ("resource not found, updating schema..." )
56
+ logger .Info (). Msg ( "resource not found, updating schema..." )
54
57
return ctrl.Result {}, r .updateAPISchema ()
55
58
}
56
59
if client .IgnoreNotFound (err ) != nil {
57
- logger .Error (err , "failed to get reconciled object" )
60
+ logger .Error (). Err ( err ). Msg ( "failed to get reconciled object" )
58
61
return ctrl.Result {}, errors .Join (ErrGetReconciledObj , err )
59
62
}
60
63
0 commit comments