Merge pull request #44612 from nikhita/fix-patch-crash

Automatic merge from submit-queue Fix kube-apiserver crash when patching TPR data **What this PR does / why we need it**: While trying to do a strategic merge patch, kube-apiserver crashes with a nil pointer dereference because `UnsafeConvertor` is `nil` for TPR data resources here: https://github.com/kubernetes/kubernetes/blob/master/pkg/master/thirdparty/thirdparty.go#L314-L337. This PR does not make strategic merge patch work on TPR data but makes sure that the kube-api server does not crash while trying to do so. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #44587 **Special notes for your reviewer**: **Release note**: ``` NONE ```

Merge pull request #44612 from nikhita/fix-patch-crash
2879b2cb · Kubernetes Submit Queue · GitHub · a4c4cfe9 · e919e8c4 · 2879b2cb
Commit 2879b2cb authored May 16, 2017 by Kubernetes Submit Queue Committed by GitHub May 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

thirdparty.go pkg/master/thirdparty/thirdparty.go +6 -5

No files found.
--- a/pkg/master/thirdparty/thirdparty.go
+++ b/pkg/master/thirdparty/thirdparty.go
@@ -318,11 +318,12 @@ func (m *ThirdPartyResourceServer) thirdpartyapi(group, kind, version, pluralRes
 		Root:         apiRoot,
 		GroupVersion: externalVersion,

-		Creater:   thirdpartyresourcedata.NewObjectCreator(group, version, api.Scheme),
-		Convertor: api.Scheme,
-		Copier:    api.Scheme,
-		Defaulter: api.Scheme,
-		Typer:     api.Scheme,
+		Creater:         thirdpartyresourcedata.NewObjectCreator(group, version, api.Scheme),
+		Convertor:       api.Scheme,
+		Copier:          api.Scheme,
+		Defaulter:       api.Scheme,
+		Typer:           api.Scheme,
+		UnsafeConvertor: api.Scheme,

 		Mapper:                 thirdpartyresourcedata.NewMapper(api.Registry.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group),
 		Linker:                 api.Registry.GroupOrDie(extensions.GroupName).SelfLinker,