From a536ee3615e15954c63b0ccea0885837e2846e1e Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 20 Jun 2017 11:05:31 -0400 Subject: [PATCH] Fix rawextension decoding in update --- staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go index bf7b8838536..f238d447d32 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go @@ -862,7 +862,8 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType defaultGVK := scope.Kind original := r.New() trace.Step("About to convert to expected version") - obj, gvk, err := scope.Serializer.DecoderToVersion(s.Serializer, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, original) + decoder := scope.Serializer.DecoderToVersion(s.Serializer, schema.GroupVersion{Group: defaultGVK.Group, Version: runtime.APIVersionInternal}) + obj, gvk, err := decoder.Decode(body, &defaultGVK, original) if err != nil { err = transformDecodeError(typer, err, original, gvk, body) scope.err(err, w, req)