From 307b09fda811a61072de8977c882fbd9f49be06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20Wiesm=C3=BCller?= <kwiesmueller@seibert-media.net>
Date: Thu, 24 Jan 2019 17:46:15 +0100
Subject: [PATCH] make userAgent usage consistent

---
 .../src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go  | 8 ++------
 1 file changed, 2 insertions(+), 6 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 c7476162351..c187f50bad6 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
@@ -311,7 +311,7 @@ func (p *jsonPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (r
 	}
 
 	if p.fieldManager != nil {
-		if objToUpdate, err = p.fieldManager.Update(currentObject, objToUpdate, p.prefixFromUserAgent()); err != nil {
+		if objToUpdate, err = p.fieldManager.Update(currentObject, objToUpdate, prefixFromUserAgent(p.userAgent)); err != nil {
 			return nil, fmt.Errorf("failed to update object managed fields: %v", err)
 		}
 	}
@@ -373,7 +373,7 @@ func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (ru
 	}
 
 	if p.fieldManager != nil {
-		if newObj, err = p.fieldManager.Update(currentObject, newObj, p.prefixFromUserAgent()); err != nil {
+		if newObj, err = p.fieldManager.Update(currentObject, newObj, prefixFromUserAgent(p.userAgent)); err != nil {
 			return nil, fmt.Errorf("failed to update object managed fields: %v", err)
 		}
 	}
@@ -550,10 +550,6 @@ func (p *patcher) patchResource(ctx context.Context, scope RequestScope) (runtim
 	return result, wasCreated, err
 }
 
-func (p *patcher) prefixFromUserAgent() string {
-	return prefixFromUserAgent(p.userAgent)
-}
-
 // applyPatchToObject applies a strategic merge patch of <patchMap> to
 // <originalMap> and stores the result in <objToUpdate>.
 // NOTE: <objToUpdate> must be a versioned object.