change gpu-plugin path from config()

Signed-off-by: Swati Gupta <[email protected]>

Author: guptaNswati

cmd/gpu-kubelet-plugin/device_state.go

@@ -85,7 +85,7 @@ func NewDeviceState(ctx context.Context, config *Config) (*DeviceState, error) {
 	}
 
 	tsManager := NewTimeSlicingManager(nvdevlib)
-	mpsManager := NewMpsManager(config, nvdevlib, config.MpsRoot(), hostDriverRoot, MpsControlDaemonTemplatePath)
+	mpsManager := NewMpsManager(config, nvdevlib, hostDriverRoot, MpsControlDaemonTemplatePath)
 
 	if err := cdi.CreateStandardDeviceSpecFile(allocatable); err != nil {
 		return nil, fmt.Errorf("unable to create base CDI spec file: %v", err)

cmd/gpu-kubelet-plugin/driver.go

@@ -33,30 +33,30 @@ import (
 	"github.com/NVIDIA/k8s-dra-driver-gpu/pkg/flock"
 )
 
+// DriverPrepUprepFlockPath is the path to a lock file used to make sure
+// that calls to nodePrepareResource() / nodeUnprepareResource() never
+// interleave, node-globally.
+const DriverPrepUprepFlockFileName = "pu.lock"
+
 type driver struct {
 	client       coreclientset.Interface
 	pluginhelper *kubeletplugin.Helper
 	state        *DeviceState
 	pulock       *flock.Flock
 }
 
-// DriverPrepUprepFlockPath is the path to a lock file used to make sure
-// that calls to nodePrepareResource() / nodeUnprepareResource() never
-// interleave, node-globally.
-func (c Config) DriverPrepUprepFlockPath() string {
-	return filepath.Join(c.DriverPluginPath(), "pu.lock")
-}
-
 func NewDriver(ctx context.Context, config *Config) (*driver, error) {
 	state, err := NewDeviceState(ctx, config)
 	if err != nil {
 		return nil, err
 	}
 
+	puLockPath := filepath.Join(config.DriverPluginPath(), DriverPrepUprepFlockFileName)
+
 	driver := &driver{
 		client: config.clientsets.Core,
 		state:  state,
-		pulock: flock.NewFlock(config.DriverPrepUprepFlockPath()),
+		pulock: flock.NewFlock(puLockPath),
 	}
 
 	helper, err := kubeletplugin.Start(
@@ -97,7 +97,6 @@ func (d *driver) Shutdown() error {
 	if d == nil {
 		return nil
 	}
-
 	d.pluginhelper.Stop()
 	return nil
 }

cmd/gpu-kubelet-plugin/sharing.go

@@ -52,6 +52,7 @@ import (
 )
 
 const (
+	MpsControlFilesDirName       = "mps"
 	MpsControlDaemonTemplatePath = "/templates/mps-control-daemon.tmpl.yaml"
 	MpsControlDaemonNameFmt      = "mps-control-daemon-%v" // Fill with ClaimUID
 )
@@ -97,10 +98,6 @@ type MpsControlDaemonTemplateData struct {
 	FeatureGates                    map[string]bool
 }
 
-func (c Config) MpsRoot() string {
-	return filepath.Join(c.DriverPluginPath(), "mps")
-}
-
 func NewTimeSlicingManager(deviceLib *deviceLib) *TimeSlicingManager {
 	return &TimeSlicingManager{
 		nvdevlib: deviceLib,
@@ -128,7 +125,9 @@ func (t *TimeSlicingManager) SetTimeSlice(devices UUIDProvider, config *configap
 	return nil
 }
 
-func NewMpsManager(config *Config, deviceLib *deviceLib, controlFilesRoot, hostDriverRoot, templatePath string) *MpsManager {
+func NewMpsManager(config *Config, deviceLib *deviceLib, hostDriverRoot, templatePath string) *MpsManager {
+	controlFilesRoot := filepath.Join(config.DriverPluginPath(), MpsControlFilesDirName)
+
 	return &MpsManager{
 		controlFilesRoot: controlFilesRoot,
 		hostDriverRoot:   hostDriverRoot,