Merge pull request #2786 from smarterclayton/load_opaque_objects

Allow runtime.Object to be encoded as runtime.RawExtension
This commit is contained in:
Daniel Smith
2014-12-10 16:24:05 -08:00
20 changed files with 384 additions and 58 deletions

View File

@@ -112,7 +112,7 @@ func (s *Scheme) DecodeInto(data []byte, obj interface{}) error {
} else {
external, err := s.NewObject(dataVersion, dataKind)
if err != nil {
return fmt.Errorf("unable to create new object of type ('%s', '%s')", dataVersion, dataKind)
return err
}
// yaml is a superset of json, so we use it to decode here. That way,
// we understand both.