change computedomain path from config()

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

Author: guptaNswati

cmd/compute-domain-kubelet-plugin/computedomain.go

@@ -43,6 +43,7 @@ const (
 	informerResyncPeriod = 10 * time.Minute
 	cleanupInterval      = 10 * time.Minute
 
+	ComputeDomainDaemonConfigFilesDirName = "domains"
 	ComputeDomainDaemonConfigTemplatePath = "/templates/compute-domain-daemon-config.tmpl.cfg"
 )
 
@@ -66,13 +67,10 @@ type ComputeDomainDaemonSettings struct {
 	nodesConfigPath string
 }
 
-func (c Config) ComputeDomainDaemonSettingsRoot() string {
-	return filepath.Join(c.DriverPluginPath(), "domains")
-}
-
-func NewComputeDomainManager(config *Config, configFilesRoot, cliqueID string) *ComputeDomainManager {
+func NewComputeDomainManager(config *Config, cliqueID string) *ComputeDomainManager {
 	factory := nvinformers.NewSharedInformerFactory(config.clientsets.Nvidia, informerResyncPeriod)
 	informer := factory.Resource().V1beta1().ComputeDomains().Informer()
+	configFilesRoot := filepath.Join(config.DriverPluginPath(), ComputeDomainDaemonConfigFilesDirName)
 
 	m := &ComputeDomainManager{
 		config:          config,

cmd/compute-domain-kubelet-plugin/device_state.go

@@ -90,7 +90,7 @@ func NewDeviceState(ctx context.Context, config *Config) (*DeviceState, error) {
 		return nil, fmt.Errorf("error getting cliqueID: %w", err)
 	}
 
-	computeDomainManager := NewComputeDomainManager(config, config.ComputeDomainDaemonSettingsRoot(), cliqueID)
+	computeDomainManager := NewComputeDomainManager(config, cliqueID)
 
 	if err := cdi.CreateStandardDeviceSpecFile(allocatable); err != nil {
 		return nil, fmt.Errorf("unable to create base CDI spec file: %v", err)

cmd/compute-domain-kubelet-plugin/driver.go

@@ -43,6 +43,10 @@ const (
 	// that deadline, retryable errors are retried (with backoff) via the
 	// workqueue abstraction.
 	ErrorRetryMaxTimeout = 45 * time.Second
+	// DriverPrepUprepFlockPath is the path to a lock file used to make sure
+	// that calls to nodePrepareResource() / nodeUnprepareResource() never
+	// interleave, node-globally.
+	DriverPrepUprepFlockFileName = "pu.lock"
 )
 
 // permanentError defines an error indicating that it is permanent.
@@ -61,23 +65,18 @@ type driver struct {
 	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(