Skip to content

K
k3s
Commit ed763b80 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29419 from wangxing1517/remove_redundant_ToJSON

Automatic merge from submit-queue Remove redundant ToJSON <!-- Checklist for submitting a Pull Request Please remove this comment block before submitting. 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 3. If you want this PR to automatically close an issue when it is merged, add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>` to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests). 4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. --> ToJSON in pkg/kubectl/resource/visitor.go#ValidateSchema is unnecessary, because "data" will be checked in schema.ValidateBytes [pkg/api/validation/schema.go] shortly.
parents 2af3f03f 6cabb084
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
pkg/kubectl/resource/visitor.go
View file @ ed763b80
...@@ -207,10 +207,6 @@ func ValidateSchema(data []byte, schema validation.Schema) error { ...@@ -207,10 +207,6 @@ func ValidateSchema(data []byte, schema validation.Schema) error {
if schema == nil { if schema == nil {
return nil return nil
} }
data, err := yaml.ToJSON(data)
if err != nil {
return fmt.Errorf("error converting to YAML: %v", err)
}
if err := schema.ValidateBytes(data); err != nil { if err := schema.ValidateBytes(data); err != nil {
return fmt.Errorf("error validating data: %v; %s", err, stopValidateMessage) return fmt.Errorf("error validating data: %v; %s", err, stopValidateMessage)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment