Merge pull request #9789 from tharun208/fix/config_memory

fix unable to set memory in config
kubernetes · Dec 8, 2020 · 3e670f2 · 3e670f2
2 parents 4a0382f + 5b8670c
commit 3e670f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go
@@ -92,8 +92,8 @@ var settings = []Setting{
 	},
 	{
 		name:        "memory",
-		set:         SetInt,
-		validations: []setFn{IsPositive},
+		set:         SetString,
+		validations: []setFn{IsValidDiskSize},
 		callbacks:   []setFn{RequiresRestartMsg},
 	},
 	{

diff --git a/cmd/minikube/cmd/config/set_test.go b/cmd/minikube/cmd/config/set_test.go
@@ -38,6 +38,10 @@ func TestSetNotAllowed(t *testing.T) {
 	if err == nil || err.Error() != "run validations for \"driver\" with value of \"123456\": [driver \"123456\" is not supported]" {
 		t.Fatalf("Set did not return error for unallowed value: %+v", err)
 	}
+	err = Set("memory", "10a")
+	if err == nil || err.Error() != "run validations for \"memory\" with value of \"10a\": [invalid disk size: invalid size: '10a']" {
+		t.Fatalf("Set did not return error for unallowed value: %+v", err)
+	}
 }
 
 func TestSetOK(t *testing.T) {