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

Merge pull request #510 from vimalk78/fix-table-minor 

internal/model/table : return error if reconcile failed
mine
Fernand Galiana 2020-01-25 10:35:49 -07:00 committed by GitHub
parent e89e59d8a8 3f217ff95b
commit ed2dbe0c35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/model/table.go
View File

@ -234,19 +234,21 @@ func (t *Table) reconcile(ctx context.Context) error {
} }
var rows render.Rows var rows render.Rows
if _, ok := meta.Renderer.(*render.Generic); ok { if len(oo) > 0 {
table, ok := oo[0].(*metav1beta1.Table) if _, ok := meta.Renderer.(*render.Generic); ok {
if !ok { table, ok := oo[0].(*metav1beta1.Table)
return fmt.Errorf("expecting a meta table but got %T", oo[0]) if !ok {
} return fmt.Errorf("expecting a meta table but got %T", oo[0])
rows = make(render.Rows, len(table.Rows)) }
if err := genericHydrate(t.namespace, table, rows, meta.Renderer); err != nil { rows = make(render.Rows, len(table.Rows))
return err if err := genericHydrate(t.namespace, table, rows, meta.Renderer); err != nil {
} return err
} else { }
rows = make(render.Rows, len(oo)) } else {
if err := hydrate(t.namespace, oo, rows, meta.Renderer); err != nil { rows = make(render.Rows, len(oo))
return err if err := hydrate(t.namespace, oo, rows, meta.Renderer); err != nil {
return err
}
} }
} }