[kubectl-plugin] Validate empty resouce quantity strings (#3821)

Signed-off-by: win5923 <[email protected]>

Author: win5923

kubectl-plugin/pkg/cmd/create/create_cluster.go

@@ -205,11 +205,10 @@ func (options *CreateClusterOptions) Validate(cmd *cobra.Command) error {
 		}
 
 		for name, value := range resourceFields {
-			if (name == "head-ephemeral-storage" || name == "worker-ephemeral-storage") && value == "" {
-				continue
-			}
-			if err := util.ValidateResourceQuantity(value, name); err != nil {
-				return fmt.Errorf("%w", err)
+			if value != "" || cmd.Flags().Changed(name) {
+				if err := util.ValidateResourceQuantity(value, name); err != nil {
+					return fmt.Errorf("%w", err)
+				}
 			}
 		}
 	}

kubectl-plugin/pkg/cmd/job/job_submit.go

@@ -300,8 +300,10 @@ func (options *SubmitJobOptions) Validate(cmd *cobra.Command) error {
 	}
 
 	for name, value := range resourceFields {
-		if err := util.ValidateResourceQuantity(value, name); err != nil {
-			return fmt.Errorf("%w", err)
+		if value != "" || cmd.Flags().Changed(name) {
+			if err := util.ValidateResourceQuantity(value, name); err != nil {
+				return fmt.Errorf("%w", err)
+			}
 		}
 	}
 

kubectl-plugin/pkg/util/validation.go

@@ -9,10 +9,6 @@ import (
 const tpuDocURL = "https://cloud.google.com/kubernetes-engine/docs/concepts/plan-tpus#availability"
 
 func ValidateResourceQuantity(value string, name string) error {
-	if value == "" {
-		return nil
-	}
-
 	q, err := resource.ParseQuantity(value)
 	if err != nil {
 		return fmt.Errorf("%s is not a valid resource quantity: %w", name, err)

kubectl-plugin/pkg/util/validation_test.go

@@ -16,7 +16,10 @@ func TestValidateResourceQuantity(t *testing.T) {
 		{"aaa", "cpu", true},
 		{"10Gi", "memory", false},
 		{"bbb", "memory", true},
-		{"", "memory", false},
+		{"", "memory", true},
+		{"", "ephemeral-storage", true},
+		{"100Gi", "head-ephemeral-storage", false},
+		{"-100Gi", "worker-ephemeral-storage", true},
 	}
 
 	for _, tt := range tests {