Skip to content

K
k3s
Commit 385ae07b authored by Robert Bailey's avatar Robert Bailey
Browse files
Options

Merge pull request #24919 from kargakis/avoid-panic-in-mapper

kubectl: avoid panic with nil gvk
parents 01c6b374 29ff69fd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubectl/resource/mapper.go
View file @ 385ae07b
...@@ -52,6 +52,9 @@ type Mapper struct { ...@@ -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()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment