change ExtFields to value instead of Pointer.
parent
9c11343733
commit
70603d9ec7
|
|
@ -101,8 +101,8 @@ func (*Base) NumCols(n string) map[string]bool {
|
|||
}
|
||||
|
||||
// ExtFields returns extended fields in relation to headers.
|
||||
func (*Base) ExtFields() (*TypeMeta, error) {
|
||||
return nil, errors.New("Base does not have extended fields.")
|
||||
func (*Base) ExtFields() (TypeMeta, error) {
|
||||
return TypeMeta{}, errors.New("Base does not have extended fields.")
|
||||
}
|
||||
|
||||
// Get a resource by name
|
||||
|
|
|
|||
|
|
@ -92,12 +92,12 @@ func (r *CustomResourceDefinition) Fields(ns string) Row {
|
|||
}
|
||||
|
||||
// ExtFields returns extended fields.
|
||||
func (r *CustomResourceDefinition) ExtFields() (*TypeMeta, error) {
|
||||
m := &TypeMeta{}
|
||||
func (r *CustomResourceDefinition) ExtFields() (TypeMeta, error) {
|
||||
m := TypeMeta{}
|
||||
i := r.instance
|
||||
spec, ok := i.Object["spec"].(map[string]interface{})
|
||||
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 {
|
||||
|
|
@ -107,7 +107,7 @@ func (r *CustomResourceDefinition) ExtFields() (*TypeMeta, error) {
|
|||
m.Namespaced = isNamespaced(spec["scope"].(string))
|
||||
names, ok := spec["names"].(map[string]interface{})
|
||||
if !ok {
|
||||
return nil, errors.New("missing crd names")
|
||||
return m, errors.New("missing crd names")
|
||||
}
|
||||
m.Kind = names["kind"].(string)
|
||||
m.Singular, m.Plural = names["singular"].(string), names["plural"].(string)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ type (
|
|||
Columnar interface {
|
||||
Header(ns string) Row
|
||||
Fields(ns string) Row
|
||||
ExtFields() (*TypeMeta, error)
|
||||
ExtFields() (TypeMeta, error)
|
||||
Name() string
|
||||
SetPodMetrics(*mv1beta1.PodMetrics)
|
||||
SetNodeMetrics(*mv1beta1.NodeMetrics)
|
||||
|
|
|
|||
Loading…
Reference in New Issue