From d08024644247c5382cfb0627bf7f3616c53d3e87 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 9 Dec 2016 04:19:28 -0500 Subject: [PATCH] Make thirdpartyresource encode objectmeta correctly --- pkg/registry/extensions/thirdpartyresourcedata/codec.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index 78ad5e34fcd..8f0c3323a08 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -480,7 +480,14 @@ func encodeToJSON(obj *extensions.ThirdPartyResourceData, stream io.Writer) erro if !ok { 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) return encoder.Encode(objMap) }