From e919e8c467b34f2eb06ed11f05e5a6fe93c8082b Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Tue, 18 Apr 2017 19:41:50 +0530 Subject: [PATCH] Fix kube-apiserver crash when patching TPR data While trying to do a strategic merge patch, kube-apiserver crashes with a nil pointer dereference because UnsafeConvertor is nil for TPR data resources. Fixes #44587 --- pkg/master/thirdparty/thirdparty.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 068a33a66e5..7427853a068 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -315,11 +315,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,