github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Make unstructured scheme aware of VersionedObjects

Browse Source 
UnstructuredJSONScheme now handles decoding into VersionedObjects
properly by decoding into Unstructured and putting it in the object list.
This commit is contained in:
Kris 2016-05-11 15:36:08 -07:00
parent 1795edf355
commit 6cd2fa6b42
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/runtime/unstructured.go
View File

@ -98,6 +98,13 @@ func (s unstructuredJSONScheme) decodeInto(data []byte, obj Object) error {
return s.decodeToUnstructured(data, x) return s.decodeToUnstructured(data, x)
case *UnstructuredList: case *UnstructuredList:
return s.decodeToList(data, x) return s.decodeToList(data, x)
case *VersionedObjects:
u := new(Unstructured)
err := s.decodeToUnstructured(data, u)
if err == nil {
x.Objects = []Object{u}
}
return err
default: default:
return json.Unmarshal(data, x) return json.Unmarshal(data, x)
} }