Merge pull request #15610 from afbjorklund/numcpu-kubeadm

Allow running none driver with force on 1 CPU

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -197,6 +197,11 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		"Port-10250", // For "none" users who already have a kubelet online
 		"Swap",       // For "none" users who have swap configured
 	}
+	if version.GE(semver.MustParse("1.13.0")) {
+		ignore = append(ignore,
+			"NumCPU", // For "none" users who have too few CPUs
+		)
+	}
 	if version.GE(semver.MustParse("1.20.0")) {
 		ignore = append(ignore,
 			"Mem", // For "none" users who have too little memory