Merge pull request #7082 from priyawadhwa/ignore-memory

Fix bug where global config memory was ignored
kubernetes · Mar 18, 2020 · 8fdb23c · 8fdb23c
2 parents 07e8420 + dd70782
commit 8fdb23c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -666,6 +666,9 @@ func memoryLimits(drvName string) (int, int, error) {
 
 // suggestMemoryAllocation calculates the default memory footprint in MB
 func suggestMemoryAllocation(sysLimit int, containerLimit int) int {
+	if mem := viper.GetInt(memory); mem != 0 {
+		return mem
+	}
 	fallback := 2200
 	maximum := 6000