jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change ExtFields to value instead of Pointer.

mine
Gustavo Paiva 2019-10-09 01:18:01 -03:00
parent 9c11343733
commit 70603d9ec7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/resource/base.go
View File

@ -101,8 +101,8 @@ func (*Base) NumCols(n string) map[string]bool {
} }
// ExtFields returns extended fields in relation to headers. // ExtFields returns extended fields in relation to headers.
func (*Base) ExtFields() (*TypeMeta, error) { func (*Base) ExtFields() (TypeMeta, error) {
return nil, errors.New("Base does not have extended fields.") return TypeMeta{}, errors.New("Base does not have extended fields.")
} }
// Get a resource by name // Get a resource by name

8
internal/resource/crd.go
View File

@ -92,12 +92,12 @@ func (r *CustomResourceDefinition) Fields(ns string) Row {
} }
// ExtFields returns extended fields. // ExtFields returns extended fields.
func (r *CustomResourceDefinition) ExtFields() (*TypeMeta, error) { func (r *CustomResourceDefinition) ExtFields() (TypeMeta, error) {
m := &TypeMeta{} m := TypeMeta{}
i := r.instance i := r.instance
spec, ok := i.Object["spec"].(map[string]interface{}) spec, ok := i.Object["spec"].(map[string]interface{})
if !ok { if !ok {
return nil, errors.New("missing crd specs") return m, errors.New("missing crd specs")
} }
if meta, ok := i.Object["metadata"].(map[string]interface{}); ok { if meta, ok := i.Object["metadata"].(map[string]interface{}); ok {
@ -107,7 +107,7 @@ func (r *CustomResourceDefinition) ExtFields() (*TypeMeta, error) {
m.Namespaced = isNamespaced(spec["scope"].(string)) m.Namespaced = isNamespaced(spec["scope"].(string))
names, ok := spec["names"].(map[string]interface{}) names, ok := spec["names"].(map[string]interface{})
if !ok { if !ok {
return nil, errors.New("missing crd names") return m, errors.New("missing crd names")
} }
m.Kind = names["kind"].(string) m.Kind = names["kind"].(string)
m.Singular, m.Plural = names["singular"].(string), names["plural"].(string) m.Singular, m.Plural = names["singular"].(string), names["plural"].(string)

2
internal/resource/list.go
View File

@ -90,7 +90,7 @@ type (
Columnar interface { Columnar interface {
Header(ns string) Row Header(ns string) Row
Fields(ns string) Row Fields(ns string) Row
ExtFields() (*TypeMeta, error) ExtFields() (TypeMeta, error)
Name() string Name() string
SetPodMetrics(*mv1beta1.PodMetrics) SetPodMetrics(*mv1beta1.PodMetrics)
SetNodeMetrics(*mv1beta1.NodeMetrics) SetNodeMetrics(*mv1beta1.NodeMetrics)