From 870d121d5e8033a72c62ef3a64939f0eacab6798 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 22 Oct 2018 10:01:27 -0400 Subject: [PATCH] Inline patch#toUnversioned --- .../apiserver/pkg/endpoints/handlers/patch.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go index d73c3fd573e..4163b18267a 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go @@ -242,11 +242,6 @@ type patcher struct { mechanism patchMechanism } -func (p *patcher) toUnversioned(versionedObj runtime.Object) (runtime.Object, error) { - gvk := p.kind.GroupKind().WithVersion(runtime.APIVersionInternal) - return p.unsafeConvertor.ConvertToVersion(versionedObj, gvk.GroupVersion()) -} - type patchMechanism interface { applyPatchToCurrentObject(currentObject runtime.Object) (runtime.Object, error) } @@ -321,12 +316,8 @@ func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (ru return nil, err } // Convert the object back to unversioned (aka internal version). - unversionedObjToUpdate, err := p.toUnversioned(versionedObjToUpdate) - if err != nil { - return nil, err - } - - return unversionedObjToUpdate, nil + gvk := p.kind.GroupKind().WithVersion(runtime.APIVersionInternal) + return p.unsafeConvertor.ConvertToVersion(versionedObjToUpdate, gvk.GroupVersion()) } // strategicPatchObject applies a strategic merge patch of to