github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix kube-apiserver crash when patching TPR data

Browse Source 
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
This commit is contained in:
Nikhita Raghunath 2017-04-18 19:41:50 +05:30
parent eccba3b6d0
commit e919e8c467
No known key found for this signature in database
GPG Key ID: B944F27A57CF61F5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/master/thirdparty/thirdparty.go vendored
View File

@ -315,11 +315,12 @@ func (m *ThirdPartyResourceServer) thirdpartyapi(group, kind, version, pluralRes
Root: apiRoot, Root: apiRoot,
GroupVersion: externalVersion, GroupVersion: externalVersion,
Creater: thirdpartyresourcedata.NewObjectCreator(group, version, api.Scheme), Creater: thirdpartyresourcedata.NewObjectCreator(group, version, api.Scheme),
Convertor: api.Scheme, Convertor: api.Scheme,
Copier: api.Scheme, Copier: api.Scheme,
Defaulter: api.Scheme, Defaulter: api.Scheme,
Typer: api.Scheme, Typer: api.Scheme,
UnsafeConvertor: api.Scheme,
Mapper: thirdpartyresourcedata.NewMapper(api.Registry.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group), Mapper: thirdpartyresourcedata.NewMapper(api.Registry.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group),
Linker: api.Registry.GroupOrDie(extensions.GroupName).SelfLinker, Linker: api.Registry.GroupOrDie(extensions.GroupName).SelfLinker,