github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 02:11:09 +00:00
Code Issues Projects Releases Wiki Activity

Define NoOptDefVal for validate flag

Browse Source 
validate flag does not have default value defined when there is no
parameter passed, therefore it tries to use next irrelevant flag.

This PR defines NoOptDefVal for validate flag which is set "strict".
This commit is contained in:
Arda Güçlü 2022-05-06 10:25:40 +03:00
parent 7141b6d58d
commit 0245e74590
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go
View File

@ -407,6 +407,8 @@ func AddValidateFlags(cmd *cobra.Command) {
"warn" will warn about unknown or duplicate fields without blocking the request if server-side field validation is enabled on the API server, and behave as "ignore" otherwise. "warn" will warn about unknown or duplicate fields without blocking the request if server-side field validation is enabled on the API server, and behave as "ignore" otherwise.
"false" or "ignore" will not perform any schema validation, silently dropping any unknown or duplicate fields.`, "false" or "ignore" will not perform any schema validation, silently dropping any unknown or duplicate fields.`,
) )
cmd.Flags().Lookup("validate").NoOptDefVal = "strict"
} }
func AddFilenameOptionFlags(cmd *cobra.Command, options *resource.FilenameOptions, usage string) { func AddFilenameOptionFlags(cmd *cobra.Command, options *resource.FilenameOptions, usage string) {
@ -584,6 +586,8 @@ func GetValidationDirective(cmd *cobra.Command) (string, error) {
b, err := strconv.ParseBool(validateFlag) b, err := strconv.ParseBool(validateFlag)
if err != nil { if err != nil {
switch validateFlag { switch validateFlag {
case "":
return metav1.FieldValidationStrict, nil
case cmd.Flag("validate").NoOptDefVal: case cmd.Flag("validate").NoOptDefVal:
return metav1.FieldValidationStrict, nil return metav1.FieldValidationStrict, nil
case "strict": case "strict":

6
test/cmd/create.sh
View File

@ -170,6 +170,12 @@ run_kubectl_create_validate_tests() {
create_and_use_new_namespace create_and_use_new_namespace
## test --validate no value expects default strict is used
kube::log::status "Testing kubectl create --validate"
# create and verify
output_message=$(! kubectl create -f hack/testdata/invalid-deployment-unknown-and-duplicate-fields.yaml --validate 2>&1)
has_one_of_error_message "${output_message}" 'strict decoding error' 'error validating data'
## test --validate=true ## test --validate=true
kube::log::status "Testing kubectl create --validate=true" kube::log::status "Testing kubectl create --validate=true"
# create and verify # create and verify