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

Make thirdpartyresource encode objectmeta correctly

Browse Source
This commit is contained in:
Jordan Liggitt 2016-12-09 04:19:28 -05:00
parent 8b34e0ed53
commit d080246442
No known key found for this signature in database
GPG Key ID: 24E7ADF9A3B42012
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/registry/extensions/thirdpartyresourcedata/codec.go
View File

@ -480,7 +480,14 @@ func encodeToJSON(obj *extensions.ThirdPartyResourceData, stream io.Writer) erro
if !ok { if !ok {
return fmt.Errorf("unexpected type: %v", objOut) return fmt.Errorf("unexpected type: %v", objOut)
} }
objMap["metadata"] = obj.ObjectMeta
// Convert to a serializable type
versionedObjectMeta := &v1.ObjectMeta{}
if err := v1.Convert_api_ObjectMeta_To_v1_ObjectMeta(&obj.ObjectMeta, versionedObjectMeta, nil); err != nil {
return err
}
objMap["metadata"] = versionedObjectMeta
encoder := json.NewEncoder(stream) encoder := json.NewEncoder(stream)
return encoder.Encode(objMap) return encoder.Encode(objMap)
} }