refactor: move shouldSkipUninstall check after operand eviction to ensure mount refresh

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

Author: karthikvetrivel

cmd/driver-manager/main.go

@@ -287,11 +287,6 @@ func (dm *DriverManager) uninstallDriver() error {
 		return fmt.Errorf("driver is pre-installed on host")
 	}
 
-	if skip, reason := dm.shouldSkipUninstall(); skip {
-		dm.log.Infof("Skipping driver uninstall: %s", reason)
-		return nil
-	}
-
 	// Fetch current component states
 	if err := dm.fetchCurrentLabels(); err != nil {
 		return fmt.Errorf("failed to fetch current labels: %w", err)
@@ -309,6 +304,14 @@ func (dm *DriverManager) uninstallDriver() error {
 		return fmt.Errorf("failed to evict GPU operator components: %w", err)
 	}
 
+	if skip, reason := dm.shouldSkipUninstall(); skip {
+		dm.log.Infof("Skipping driver uninstall: %s", reason)
+		if err := dm.rescheduleGPUOperatorComponents(); err != nil {
+			dm.log.Warnf("Failed to reschedule GPU operator components: %v", err)
+		}
+		return nil
+	}
+
 	drainOpts := kube.DrainOptions{
 		Force:              dm.config.drainUseForce,
 		DeleteEmptyDirData: dm.config.drainDeleteEmptyDirData,
@@ -661,7 +664,7 @@ func (dm *DriverManager) shouldSkipUninstall() (bool, string) {
 	}
 
 	if dm.config.driverVersion == "" {
-		return false, ""
+		return false, "Driver version environment variable is not set"
 	}
 
 	version, err := dm.detectCurrentDriverVersion()