Fix no-limit option for config validation

kubernetes · Oct 30, 2023 · 407c000 · 407c000
1 parent 51f509e
commit 407c000
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/cmd/minikube/cmd/config/validations.go b/cmd/minikube/cmd/config/validations.go
@@ -56,15 +56,15 @@ func IsValidDiskSize(_, disksize string) error {
 
 // IsValidCPUs checks if a string is a valid number of CPUs
 func IsValidCPUs(name, cpus string) error {
-	if cpus == constants.MaxResources {
+	if cpus == constants.MaxResources || cpus == constants.NoLimit {
 		return nil
 	}
 	return IsPositive(name, cpus)
 }
 
 // IsValidMemory checks if a string is a valid memory size
 func IsValidMemory(_, memsize string) error {
-	if memsize == constants.MaxResources {
+	if memsize == constants.MaxResources || memsize == constants.NoLimit {
 		return nil
 	}
 	_, err := units.FromHumanSize(memsize)

diff --git a/cmd/minikube/cmd/config/validations_test.go b/cmd/minikube/cmd/config/validations_test.go
@@ -146,3 +146,31 @@ func TestIsURLExists(t *testing.T) {
 
 	runValidations(t, tests, "url", IsURLExists)
 }
+
+func TestIsValidCPUs(t *testing.T) {
+	tests := []validationTest{
+		{"2", false},
+		{"16", false},
+		{"max", false},
+		{"no-limit", false},
+		{"abc", true},
+		{"-2", true},
+		{"", true},
+	}
+
+	runValidations(t, tests, "cpus", IsValidCPUs)
+}
+
+func TestIsValidMemory(t *testing.T) {
+	tests := []validationTest{
+		{"4000mb", false},
+		{"8gb", false},
+		{"max", false},
+		{"no-limit", false},
+		{"-4000", true},
+		{"abc", true},
+		{"", true},
+	}
+
+	runValidations(t, tests, "memory", IsValidMemory)
+}