Drop setup of grpc logging

marquiz · marquiz · commit 98cd96312e1f · 2025-01-07T16:13:54.000+02:00
diff --git a/cmd/nfd-master/main.go b/cmd/nfd-master/main.go
@@ -86,9 +86,6 @@ func main() {
 		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
-	// Plug klog into grpc logging infrastructure
-	utils.ConfigureGrpcKlog()
-
 	// Get new NfdMaster instance
 	instance, err := master.NewNfdMaster(master.WithArgs(args))
 	if err != nil {
diff --git a/cmd/nfd-topology-updater/main.go b/cmd/nfd-topology-updater/main.go
@@ -29,7 +29,6 @@ import (
 
 	topology "sigs.k8s.io/node-feature-discovery/pkg/nfd-topology-updater"
 	"sigs.k8s.io/node-feature-discovery/pkg/resourcemonitor"
-	"sigs.k8s.io/node-feature-discovery/pkg/utils"
 	"sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath"
 	"sigs.k8s.io/node-feature-discovery/pkg/version"
 )
@@ -52,9 +51,6 @@ func main() {
 		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
-	// Plug klog into grpc logging infrastructure
-	utils.ConfigureGrpcKlog()
-
 	// Get new TopologyUpdater instance
 	instance, err := topology.NewTopologyUpdater(*args, *resourcemonitorArgs)
 	if err != nil {
diff --git a/cmd/nfd-worker/main.go b/cmd/nfd-worker/main.go
@@ -59,9 +59,6 @@ func main() {
 		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
-	// Plug klog into grpc logging infrastructure
-	utils.ConfigureGrpcKlog()
-
 	// Get new NfdWorker instance
 	instance, err := worker.NewNfdWorker(worker.WithArgs(args))
 	if err != nil {
diff --git a/pkg/utils/grpc_log.go b/pkg/utils/grpc_log.go

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,6 @@ func main() {`
`86`	`86`	klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
`87`	`87`	`}`
`88`	`88`
`89`		`- // Plug klog into grpc logging infrastructure`
`90`		`- utils.ConfigureGrpcKlog()`
`91`		`-`
`92`	`89`	`// Get new NfdMaster instance`
`93`	`90`	`instance, err := master.NewNfdMaster(master.WithArgs(args))`
`94`	`91`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,6 @@ func main() {`
`59`	`59`	klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
`60`	`60`	`}`
`61`	`61`
`62`		`- // Plug klog into grpc logging infrastructure`
`63`		`- utils.ConfigureGrpcKlog()`
`64`		`-`
`65`	`62`	`// Get new NfdWorker instance`
`66`	`63`	`instance, err := worker.NewNfdWorker(worker.WithArgs(args))`
`67`	`64`	`if err != nil {`