Merge pull request #48017 from liggitt/encode-nested

Automatic merge from submit-queue Plumb preferred version to nested object encoder Fixes https://github.com/kubernetes/kubernetes/issues/48018

Merge pull request #48017 from liggitt/encode-nested
06453433 · Kubernetes Submit Queue · GitHub · 7800b3ff · 49b51c2d · 06453433
Commit 06453433 authored Jun 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

versioning.go ...machinery/pkg/runtime/serializer/versioning/versioning.go +1 -1

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
@@ -213,7 +213,7 @@ func (c *codec) Encode(obj runtime.Object, w io.Writer) error {
 	}
 	if e, ok := out.(runtime.NestedObjectEncoder); ok {
-		if err := e.EncodeNestedObjects(DirectEncoder{Encoder: c.encoder, ObjectTyper: c.typer}); err != nil {
+		if err := e.EncodeNestedObjects(DirectEncoder{Version: c.encodeVersion, Encoder: c.encoder, ObjectTyper: c.typer}); err != nil {
 			return err
 		}
 	}