Skip to content

Commit fb7fd72

Browse files
committed
feat: crd_controller is using a golang-commons logger now
1 parent 7f34676 commit fb7fd72

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

listener/controller/crd_controller.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import (
55
"context"
66
"errors"
77

8+
"github.com/openmfp/golang-commons/logger"
89
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
910
"github.com/openmfp/kubernetes-graphql-gateway/listener/workspacefile"
1011

1112
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1213
apierrors "k8s.io/apimachinery/pkg/api/errors"
1314
ctrl "sigs.k8s.io/controller-runtime"
1415
"sigs.k8s.io/controller-runtime/pkg/client"
15-
"sigs.k8s.io/controller-runtime/pkg/log"
1616
)
1717

1818
var (
@@ -27,34 +27,37 @@ type CRDReconciler struct {
2727
ClusterName string
2828
client.Client
2929
*apischema.CRDResolver
30-
io workspacefile.IOHandler
30+
io workspacefile.IOHandler
31+
log *logger.Logger
3132
}
3233

3334
func NewCRDReconciler(name string,
3435
clt client.Client,
3536
cr *apischema.CRDResolver,
3637
io workspacefile.IOHandler,
38+
log *logger.Logger,
3739
) *CRDReconciler {
3840
return &CRDReconciler{
3941
ClusterName: name,
4042
Client: clt,
4143
CRDResolver: cr,
4244
io: io,
45+
log: log,
4346
}
4447
}
4548

4649
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...")
4952

5053
crd := &apiextensionsv1.CustomResourceDefinition{}
5154
err := r.Client.Get(ctx, req.NamespacedName, crd)
5255
if apierrors.IsNotFound(err) {
53-
logger.Info("resource not found, updating schema...")
56+
logger.Info().Msg("resource not found, updating schema...")
5457
return ctrl.Result{}, r.updateAPISchema()
5558
}
5659
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")
5861
return ctrl.Result{}, errors.Join(ErrGetReconciledObj, err)
5962
}
6063

0 commit comments

Comments
 (0)