From 7179c766aae11bc7bfc3f8993c9b6db0a11ef9ea Mon Sep 17 00:00:00 2001 From: derailed Date: Fri, 6 Nov 2020 14:39:01 -0700 Subject: [PATCH] cleaning up --- internal/model/cluster.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/model/cluster.go b/internal/model/cluster.go index 62ef053f..363c3232 100644 --- a/internal/model/cluster.go +++ b/internal/model/cluster.go @@ -2,6 +2,7 @@ package model import ( "context" + "errors" "time" "github.com/derailed/k9s/internal/client" @@ -91,16 +92,21 @@ func (c *Cluster) UserName() string { // Metrics gathers node level metrics and compute utilization percentages. func (c *Cluster) Metrics(ctx context.Context, mx *client.ClusterMetrics) error { var ( - nn *v1.NodeList + nn *v1.NodeList err error ) if v, ok := c.cache.Get(clusterNodesKey); ok { - nn = v.(*v1.NodeList) + if nl, ok := v.(*v1.NodeList); ok { + nn = nl + } } else { if nn, err = dao.FetchNodes(ctx, c.factory, ""); err != nil { return err } } + if nn == nil { + return errors.New("Unable to fetch nodes list") + } if len(nn.Items) > 0 { c.cache.Add(clusterNodesKey, nn, clusterCacheExpiry) }