github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 08:40:42 +00:00
Code Issues Projects Releases Wiki Activity

kubectl: avoid panic with nil gvk

Browse Source 
The decoder will return a nil gvk in case it errors out and getting
the version out of that gvk naturally will panic. Bail out as soon
as we can check that the error is non-nil. kubectl edit was the primary
victim.
This commit is contained in:
Michail Kargakis 2016-04-28 11:14:11 +02:00
parent d0b887e4e0
commit 29ff69fd83
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/resource/mapper.go
View File

@ -52,6 +52,9 @@ type Mapper struct {
func (m *Mapper) InfoForData(data []byte, source string) (*Info, error) { func (m *Mapper) InfoForData(data []byte, source string) (*Info, error) {
versions := &runtime.VersionedObjects{} versions := &runtime.VersionedObjects{}
_, gvk, err := m.Decode(data, nil, versions) _, gvk, err := m.Decode(data, nil, versions)
if err != nil {
return nil, fmt.Errorf("unable to decode %q: %v", source, err)
}
var obj runtime.Object var obj runtime.Object
var versioned runtime.Object var versioned runtime.Object
if registered.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) { if registered.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) {