github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openapi: Use "group" to look for resources

Browse Source
This commit is contained in:
Antoine Pelisse
2017-08-11 09:39:12 -07:00
parent b7b5457050
commit aa1c79f32b
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/cmd/util/openapi/validation/validation.go
View File

@@ -51,7 +51,7 @@ func (v *SchemaValidation) ValidateBytes(data []byte) error {
resource := v.resources.LookupResource(gvk)
if resource == nil {
return fmt.Errorf("unknown object type %q", gvk)
return fmt.Errorf("unknown object type %#v", gvk)
}
rootValidation, err := itemFactory(openapi.NewPath(gvk.Kind), obj)
@@ -91,6 +91,7 @@ func getObjectKind(object interface{}) (schema.GroupVersionKind, error) {
return schema.GroupVersionKind{}, errors.New("apiVersion isn't string type")
}
version := apiutil.GetVersion(apiVersion.(string))
group := apiutil.GetGroup(apiVersion.(string))
kind := fields["kind"]
if kind == nil {
return schema.GroupVersionKind{}, errors.New("kind not set")
@@ -99,5 +100,5 @@ func getObjectKind(object interface{}) (schema.GroupVersionKind, error) {
return schema.GroupVersionKind{}, errors.New("kind isn't string type")
}
return schema.GroupVersionKind{Kind: kind.(string), Version: version}, nil
return schema.GroupVersionKind{Group: group, Version: version, Kind: kind.(string)}, nil
}