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

Merge pull request #109850 from ardaguclu/validate-nooptdefval

Browse Source 
Define NoOptDefVal for validate flag
This commit is contained in:
Kubernetes Prow Robot 2022-06-13 08:04:11 -07:00 committed by GitHub
commit 661cbe6823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 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,8 +586,6 @@ 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 cmd.Flag("validate").NoOptDefVal:
return metav1.FieldValidationStrict, nil
case "strict": case "strict":
return metav1.FieldValidationStrict, nil return metav1.FieldValidationStrict, nil
case "warn": case "warn":

2
staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go
View File

@ -517,7 +517,9 @@ func TestGetValidationDirective(t *testing.T) {
for _, tc := range tests { for _, tc := range tests {
cmd := &cobra.Command{} cmd := &cobra.Command{}
AddValidateFlags(cmd) AddValidateFlags(cmd)
if tc.validateFlag != "" {
cmd.Flags().Set("validate", tc.validateFlag) cmd.Flags().Set("validate", tc.validateFlag)
}
directive, err := GetValidationDirective(cmd) directive, err := GetValidationDirective(cmd)
if directive != tc.expectedDirective { if directive != tc.expectedDirective {
t.Errorf("validation directive, expected: %v, but got: %v", tc.expectedDirective, directive) t.Errorf("validation directive, expected: %v, but got: %v", tc.expectedDirective, directive)

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