Use klog contextual logger in daemon and controller

Signed-off-by: Yury Kulazhenkov <[email protected]>
Mellanox · Jul 12, 2023 · a838dc5 · a838dc5
1 parent 7d92766
commit a838dc5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/ipam-controller/app/app.go b/cmd/ipam-controller/app/app.go
@@ -19,7 +19,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/go-logr/logr"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -67,7 +66,7 @@ func NewControllerCommand() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("failed to read config for k8s client: %v", err)
 			}
-			return RunController(logr.NewContext(ctx, klog.NewKlogr()), conf, opts)
+			return RunController(klog.NewContext(ctx, klog.NewKlogr()), conf, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {
@@ -94,7 +93,7 @@ func NewControllerCommand() *cobra.Command {
 
 // RunController start IPAM controller with provided options
 func RunController(ctx context.Context, config *rest.Config, opts *options.Options) error {
-	logger := logr.FromContextOrDiscard(ctx)
+	logger := klog.FromContext(ctx)
 	ctrl.SetLogger(logger)
 
 	logger.Info("start IPAM controller",

diff --git a/cmd/ipam-daemon/app/app.go b/cmd/ipam-daemon/app/app.go
@@ -76,7 +76,7 @@ func NewControllerCommand() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("failed to read config for k8s client: %v", err)
 			}
-			return RunDaemon(logr.NewContext(ctx, klog.NewKlogr()), conf, opts)
+			return RunDaemon(klog.NewContext(ctx, klog.NewKlogr()), conf, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {
@@ -105,7 +105,7 @@ func NewControllerCommand() *cobra.Command {
 //
 //nolint:funlen
 func RunDaemon(ctx context.Context, config *rest.Config, opts *options.Options) error {
-	logger := logr.FromContextOrDiscard(ctx)
+	logger := klog.FromContext(ctx)
 	ctrl.SetLogger(logger)
 
 	logger.Info("start IPAM daemon",

diff --git a/deploy/nv-ipam.yaml b/deploy/nv-ipam.yaml
@@ -74,7 +74,7 @@ spec:
           args:
             - --node-name=$(NODE_NAME)
             - --v=1 # log level for ipam-daemon
-            - --logging-format=json
+            - --feature-gates=ContextualLogging=true
             - --bind-address=unix:///var/lib/cni/nv-ipam/daemon-socket
             - --store-file=/var/lib/cni/nv-ipam/store
             - --cni-daemon-socket=unix:///var/lib/cni/nv-ipam/daemon-socket
@@ -238,6 +238,7 @@ spec:
           imagePullPolicy: IfNotPresent
           command: [ "/ipam-controller" ]
           args:
+            - --feature-gates=ContextualLogging=true
             - --config-name=nvidia-k8s-ipam-config
             - --config-namespace=$(POD_NAMESPACE)
             - --leader-elect=true