Updated cpu check to handle none driver cpu check

kubernetes · Aug 22, 2019 · 2d763cf · 2d763cf
1 parent fac785f
commit 2d763cf
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -60,6 +60,7 @@ import (
 	"k8s.io/minikube/pkg/util/lock"
 	"k8s.io/minikube/pkg/util/retry"
 	"k8s.io/minikube/pkg/version"
+	"github.com/shirou/gopsutil/cpu"
 )
 
 const (
@@ -538,7 +539,16 @@ func validateConfig() {
 			out.V{"memory": memorySizeMB, "default_memorysize": pkgutil.CalculateSizeInMB(constants.DefaultMemorySize)})
 	}
 
-	cpuCount = viper.GetInt(cpus)
+	if viper.GetString(vmDriver) == constants.DriverNone {
+		ci, err := cpu.Info()
+		if err != nil {
+			glog.Warningf("Unable to get CPU info: $v", err)
+		} else {
+			cpuCount = ci.Cores
+		}
+	} else {
+		cpuCount = viper.GetInt(cpus)
+	}
 	if cpuCount < constants.MinimumCPUS {
 		exit.UsageT("Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}", out.V{"requested_cpus": cpuCount, "minimum_cpus": constants.MinimumCPUS})
 	}