Merge pull request kubernetes#15571 from axrav/master

refactor: avoiding repetitive code
nirs · Jan 4, 2023 · afe0f18 · afe0f18
2 parents b62cd4f + 3573ff8
commit afe0f18
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
@@ -111,6 +111,9 @@ func Available(vm bool) []DriverState {
 	klog.Infof("Querying for installed drivers using PATH=%s", os.Getenv("PATH"))
 
 	for _, d := range globalRegistry.List() {
+		if vm && !IsVM(d.Name) {
+			continue
+		}
 		if d.Status == nil {
 			klog.Errorf("%q does not implement Status", d.Name)
 			continue
@@ -123,14 +126,7 @@ func Available(vm bool) []DriverState {
 		if !s.Healthy {
 			priority = Unhealthy
 		}
-
-		if vm {
-			if IsVM(d.Name) {
-				sts = append(sts, DriverState{Name: d.Name, Default: d.Default, Preference: preference, Priority: priority, State: s})
-			}
-		} else {
-			sts = append(sts, DriverState{Name: d.Name, Default: d.Default, Preference: preference, Priority: priority, State: s})
-		}
+		sts = append(sts, DriverState{Name: d.Name, Default: d.Default, Preference: preference, Priority: priority, State: s})
 	}
 
 	// Descending priority for predictability