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

Make needed changes in conversion package to support pluggability

Browse Source
This commit is contained in:
Daniel Smith
2014-09-09 22:51:33 -07:00
parent 91e9089819
commit 71e547124c
6 changed files with 448 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/conversion/decode.go
View File

@@ -58,7 +58,7 @@ func (s *Scheme) Decode(data []byte) (interface{}, error) {
if err != nil {
return nil, err
}
err = s.converter.Convert(obj, objOut, 0)
err = s.converter.Convert(obj, objOut, 0, s.generateConvertMeta(version, s.InternalVersion))
if err != nil {
return nil, err
}
@@ -112,7 +112,7 @@ func (s *Scheme) DecodeInto(data []byte, obj interface{}) error {
if err != nil {
return err
}
err = s.converter.Convert(external, obj, 0)
err = s.converter.Convert(external, obj, 0, s.generateConvertMeta(dataVersion, objVersion))
if err != nil {
return err
}