remove internal logger in favour of klog

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>

Author: tariq1890

api/config/v1/config.go

@@ -22,6 +22,7 @@ import (
 	"os"
 
 	cli "github.com/urfave/cli/v2"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/yaml"
 )
@@ -79,26 +80,20 @@ func NewConfig(c *cli.Context, flags []cli.Flag) (*Config, error) {
 	return config, nil
 }
 
-// logger is used to issue warning in API functions without requiring an explicit implementation.
-type logger interface {
-	Warning(...interface{})
-	Warningf(string, ...interface{})
-}
-
 // DisableResourceNamingInConfig temporarily disable the resource renaming feature of the plugin.
 // This may be reenabled in a future release.
-func DisableResourceNamingInConfig(logger logger, config *Config) {
+func DisableResourceNamingInConfig(config *Config) {
 	// Disable resource renaming through config.Resource
 	if len(config.Resources.GPUs) > 0 || len(config.Resources.MIGs) > 0 {
-		logger.Warning("Customizing the 'resources' field is not yet supported in the config. Ignoring...")
+		klog.Warning("Customizing the 'resources' field is not yet supported in the config. Ignoring...")
 	}
 	config.Resources.GPUs = nil
 	config.Resources.MIGs = nil
 
 	// Disable renaming / device selection in Sharing.TimeSlicing.Resources
-	config.Sharing.TimeSlicing.disableResoureRenaming(logger, "timeSlicing")
+	config.Sharing.TimeSlicing.disableResoureRenaming("timeSlicing")
 	// Disable renaming / device selection in Sharing.MPS.Resources
-	config.Sharing.MPS.disableResoureRenaming(logger, "mps")
+	config.Sharing.MPS.disableResoureRenaming("mps")
 }
 
 // parseConfig parses a config file as either YAML of JSON and unmarshals it into a Config struct.

api/config/v1/replicas.go

@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
+	"k8s.io/klog/v2"
 )
 
 // ReplicatedResources defines generic options for replicating devices.
@@ -32,7 +33,7 @@ type ReplicatedResources struct {
 	Resources                  []ReplicatedResource `json:"resources,omitempty"                  yaml:"resources,omitempty"`
 }
 
-func (rrs *ReplicatedResources) disableResoureRenaming(logger logger, id string) {
+func (rrs *ReplicatedResources) disableResoureRenaming(id string) {
 	if rrs == nil {
 		return
 	}
@@ -56,10 +57,10 @@ func (rrs *ReplicatedResources) disableResoureRenaming(logger logger, id string)
 		}
 	}
 	if setsNonDefaultRename {
-		logger.Warningf("Setting the 'rename' field in sharing.%s.resources is not yet supported in the config. Ignoring...", id)
+		klog.Warningf("Setting the 'rename' field in sharing.%s.resources is not yet supported in the config. Ignoring...", id)
 	}
 	if setsDevices {
-		logger.Warningf("Customizing the 'devices' field in sharing.%s.resources is not yet supported in the config. Ignoring...", id)
+		klog.Warningf("Customizing the 'devices' field in sharing.%s.resources is not yet supported in the config. Ignoring...", id)
 	}
 
 }

cmd/gpu-feature-discovery/main.go

@@ -21,7 +21,6 @@ import (
 	"github.com/NVIDIA/k8s-device-plugin/internal/flags"
 	"github.com/NVIDIA/k8s-device-plugin/internal/info"
 	"github.com/NVIDIA/k8s-device-plugin/internal/lm"
-	"github.com/NVIDIA/k8s-device-plugin/internal/logger"
 	"github.com/NVIDIA/k8s-device-plugin/internal/resource"
 	"github.com/NVIDIA/k8s-device-plugin/internal/vgpu"
 	"github.com/NVIDIA/k8s-device-plugin/internal/watch"
@@ -170,7 +169,7 @@ func start(c *cli.Context, cfg *Config) error {
 		if err != nil {
 			return fmt.Errorf("unable to load config: %v", err)
 		}
-		spec.DisableResourceNamingInConfig(logger.ToKlog, config)
+		spec.DisableResourceNamingInConfig(config)
 
 		// Print the config to the output.
 		configJSON, err := json.MarshalIndent(config, "", "  ")

cmd/mps-control-daemon/main.go

@@ -34,7 +34,6 @@ import (
 	"github.com/NVIDIA/k8s-device-plugin/cmd/mps-control-daemon/mount"
 	"github.com/NVIDIA/k8s-device-plugin/cmd/mps-control-daemon/mps"
 	"github.com/NVIDIA/k8s-device-plugin/internal/info"
-	"github.com/NVIDIA/k8s-device-plugin/internal/logger"
 	"github.com/NVIDIA/k8s-device-plugin/internal/rm"
 	"github.com/NVIDIA/k8s-device-plugin/internal/watch"
 
@@ -169,7 +168,7 @@ func startDaemons(c *cli.Context, cfg *Config) ([]*mps.Daemon, bool, error) {
 	if err != nil {
 		return nil, false, fmt.Errorf("unable to load config: %v", err)
 	}
-	spec.DisableResourceNamingInConfig(logger.ToKlog, config)
+	spec.DisableResourceNamingInConfig(config)
 
 	nvmllib := nvml.New()
 	devicelib := device.New(nvmllib)

cmd/nvidia-device-plugin/main.go

@@ -35,7 +35,6 @@ import (
 
 	spec "github.com/NVIDIA/k8s-device-plugin/api/config/v1"
 	"github.com/NVIDIA/k8s-device-plugin/internal/info"
-	"github.com/NVIDIA/k8s-device-plugin/internal/logger"
 	"github.com/NVIDIA/k8s-device-plugin/internal/plugin"
 	"github.com/NVIDIA/k8s-device-plugin/internal/rm"
 	"github.com/NVIDIA/k8s-device-plugin/internal/watch"
@@ -319,7 +318,7 @@ func startPlugins(c *cli.Context, o *options) ([]plugin.Interface, bool, error)
 	if err != nil {
 		return nil, false, fmt.Errorf("unable to load config: %v", err)
 	}
-	spec.DisableResourceNamingInConfig(logger.ToKlog, config)
+	spec.DisableResourceNamingInConfig(config)
 
 	driverRoot := root(*config.Flags.Plugin.ContainerDriverRoot)
 	// We construct an NVML library specifying the path to libnvidia-ml.so.1