Remove unneeded fallback in config comparison build

Signed-off-by: Karthik Vetrivel <[email protected]>

Author: karthikvetrivel

cmd/driver-manager/main.go

@@ -51,20 +51,13 @@ const (
 
 	nvidiaDomainPrefix = "nvidia.com"
 
-	nvidiaModuleConfigFile        = "/drivers/nvidia.conf"
-	nvidiaUVMModuleConfigFile     = "/drivers/nvidia-uvm.conf"
-	nvidiaModsetModuleConfigFile  = "/drivers/nvidia-modeset.conf"
-	nvidiaPeermemModuleConfigFile = "/drivers/nvidia-peermem.conf"
+	nvidiaModuleConfigFile        = driverRoot + "/drivers/nvidia.conf"
+	nvidiaUVMModuleConfigFile     = driverRoot + "/drivers/nvidia-uvm.conf"
+	nvidiaModesetModuleConfigFile  = driverRoot + "/drivers/nvidia-modeset.conf"
+	nvidiaPeermemModuleConfigFile = driverRoot + "/drivers/nvidia-peermem.conf"
 )
 
 var (
-	driverConfigFiles = []string{
-		nvidiaModuleConfigFile,
-		nvidiaUVMModuleConfigFile,
-		nvidiaModsetModuleConfigFile,
-		nvidiaPeermemModuleConfigFile,
-	}
-
 	nvidiaDriverDeployLabel              = nvidiaDomainPrefix + "/" + "gpu.deploy.driver"
 	nvidiaOperatorValidatorDeployLabel   = nvidiaDomainPrefix + "/" + "gpu.deploy.operator-validator"
 	nvidiaContainerToolkitDeployLabel    = nvidiaDomainPrefix + "/" + "gpu.deploy.container-toolkit"
@@ -681,19 +674,6 @@ func (dm *DriverManager) isDriverLoaded() bool {
 	return err == nil
 }
 
-// getValueWithOverride extracts a value from config by key, but returns override if non-empty
-func getValueWithOverride(config, key, override string) string {
-	if override != "" {
-		return override
-	}
-	for _, line := range strings.Split(config, "\n") {
-		if strings.HasPrefix(line, key+"=") {
-			return strings.TrimPrefix(line, key+"=")
-		}
-	}
-	return ""
-}
-
 // getKernelVersion returns the current kernel version
 func getKernelVersion() string {
 	var utsname unix.Utsname
@@ -707,41 +687,30 @@ func getKernelVersion() string {
 }
 
 // buildCurrentConfig constructs the current driver configuration string
-func (dm *DriverManager) buildCurrentConfig(storedConfig string) string {
-	driverVersion := getValueWithOverride(storedConfig, "DRIVER_VERSION", dm.config.driverVersion)
-	kernelVersion := getValueWithOverride(storedConfig, "KERNEL_VERSION", getKernelVersion())
-	kernelModuleType := getValueWithOverride(storedConfig, "KERNEL_MODULE_TYPE", os.Getenv("KERNEL_MODULE_TYPE"))
-	driverTypeEnv := os.Getenv("DRIVER_TYPE")
-	if driverTypeEnv == "" {
-		driverTypeEnv = "passthrough"
+func (dm *DriverManager) buildCurrentConfig() string {
+	driverType := os.Getenv("DRIVER_TYPE")
+	if driverType == "" {
+		driverType = "passthrough"
 	}
-	driverType := getValueWithOverride(storedConfig, "DRIVER_TYPE", driverTypeEnv)
 
 	// Read module parameters from conf files
 	nvidiaParams := readModuleParams(nvidiaModuleConfigFile)
 	nvidiaUVMParams := readModuleParams(nvidiaUVMModuleConfigFile)
-	nvidiaModeset := readModuleParams(nvidiaModsetModuleConfigFile)
+	nvidiaModeset := readModuleParams(nvidiaModesetModuleConfigFile)
 	nvidiaPeermem := readModuleParams(nvidiaPeermemModuleConfigFile)
 
 	var config strings.Builder
-	config.WriteString(fmt.Sprintf("DRIVER_VERSION=%s\n", driverVersion))
+	config.WriteString(fmt.Sprintf("DRIVER_VERSION=%s\n", dm.config.driverVersion))
 	config.WriteString(fmt.Sprintf("DRIVER_TYPE=%s\n", driverType))
-	config.WriteString(fmt.Sprintf("KERNEL_VERSION=%s\n", kernelVersion))
+	config.WriteString(fmt.Sprintf("KERNEL_VERSION=%s\n", getKernelVersion()))
 	config.WriteString(fmt.Sprintf("GPU_DIRECT_RDMA_ENABLED=%v\n", dm.config.gpuDirectRDMAEnabled))
 	config.WriteString(fmt.Sprintf("USE_HOST_MOFED=%v\n", dm.config.useHostMofed))
-	config.WriteString(fmt.Sprintf("KERNEL_MODULE_TYPE=%s\n", kernelModuleType))
+	config.WriteString(fmt.Sprintf("KERNEL_MODULE_TYPE=%s\n", os.Getenv("KERNEL_MODULE_TYPE")))
 	config.WriteString(fmt.Sprintf("NVIDIA_MODULE_PARAMS=%s\n", nvidiaParams))
 	config.WriteString(fmt.Sprintf("NVIDIA_UVM_MODULE_PARAMS=%s\n", nvidiaUVMParams))
 	config.WriteString(fmt.Sprintf("NVIDIA_MODESET_MODULE_PARAMS=%s\n", nvidiaModeset))
 	config.WriteString(fmt.Sprintf("NVIDIA_PEERMEM_MODULE_PARAMS=%s\n", nvidiaPeermem))
 
-	// Append config file contents directly
-	for _, file := range driverConfigFiles {
-		if data, err := os.ReadFile(file); err == nil && len(data) > 0 {
-			config.Write(data)
-		}
-	}
-
 	return config.String()
 }
 
@@ -757,7 +726,7 @@ func readModuleParams(filepath string) string {
 
 // driverModuleBuildNeeded checks if driver modules need to be rebuilt
 func (dm *DriverManager) driverModuleBuildNeeded() bool {
-	storedData, err := os.ReadFile(driverConfigStateFile)
+	storedConfig, err := os.ReadFile(driverConfigStateFile)
 	if err != nil {
 		if os.IsNotExist(err) {
 			dm.log.Info("No previous driver configuration found")
@@ -767,10 +736,8 @@ func (dm *DriverManager) driverModuleBuildNeeded() bool {
 		return true
 	}
 
-	storedConfig := string(storedData)
-	currentConfig := dm.buildCurrentConfig(storedConfig)
-
-	return currentConfig != storedConfig
+	currentConfig := dm.buildCurrentConfig()
+	return currentConfig != string(storedConfig)
 }
 
 func (dm *DriverManager) shouldSkipUninstall() bool {