diff --git a/README.md b/README.md
index aca25acc..08190740 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ for changes and offers subsequent commands to interact with observed Kubernetes
---
[](https://goreportcard.com/report/github.com/derailed/k9s)
+[](https://golangci.com/r/github.com/derailed/k9s)
[](https://codebeat.co/projects/github-com-derailed-k9s-master)
[](https://travis-ci.com/derailed/k9s)
[](https://quay.io/repository/derailed/k9s)
diff --git a/change_logs/release_0.11.3.md b/change_logs/release_0.11.3.md
new file mode 100644
index 00000000..338ff808
--- /dev/null
+++ b/change_logs/release_0.11.3.md
@@ -0,0 +1,34 @@
+
+
+# Release v0.11.3
+
+## Notes
+
+Thank you to all that contributed with flushing out issues and enhancements for K9s! I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev and see if we're happier with some of the fixes! If you've filed an issue please help me verify and close. Your support, kindness and awesome suggestions to make K9s better is as ever very much noticed and appreciated!
+
+Also if you dig this tool, please make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer)
+
+---
+
+
+
+Maintenance Release!
+
+### Speedy Gonzales?
+
+In this drop, we took a bit of a perf pass in light of recent issues and thanks to [Chris Werner Rau](https://github.com/cwrau) pushing me and keeping me up to speed, I've digged a bit deeper and found that there might be some seamingly innocent calls that sucked a bit of cycles during K9s refreshes. Long story short, I think this drop will improve perf by a factor of ~10x in some instances. Typically the initial load will be slower but subsequent loads should be much faster. Famous last words right? Anyhow, can't really take credit for this one as the awesome [Gustavo Silva Paiva](https://github.com/paivagustavo) suggested doing this a while back, but since I was already in flight with the refactor decided to punt until back online. And there we are...
+
+Hopefully these findings will coalesce with yours?? If not, please send bulk prozac patches at the address below...
+
+Thanks Chris! Was up all night trying to figure out what was the deal with K9s and your specific clusters. Hopefully this time for sure??
+
+---
+
+## Resolved Bugs/Features
+
+* [Issue #475](https://github.com/derailed/k9s/issues/475)
+* [Issue #473](https://github.com/derailed/k9s/issues/473)
+
+---
+
+
© 2020 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/internal/client/client.go b/internal/client/client.go
index d8885478..ffa77896 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -3,6 +3,7 @@ package client
import (
"fmt"
"path/filepath"
+ "strings"
"sync"
"time"
@@ -10,6 +11,7 @@ import (
authorizationv1 "k8s.io/api/authorization/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/cache"
"k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/discovery/cached/disk"
"k8s.io/client-go/dynamic"
@@ -19,6 +21,12 @@ import (
versioned "k8s.io/metrics/pkg/client/clientset/versioned"
)
+const (
+ cacheSize = 100
+ cacheExpiry = 5 * time.Minute
+ cacheMXKey = "metrics"
+)
+
var supportedMetricsAPIVersions = []string{"v1beta1"}
// Authorizer checks what a user can or cannot do to a resource.
@@ -29,23 +37,26 @@ type Authorizer interface {
// APIClient represents a Kubernetes api client.
type APIClient struct {
- client kubernetes.Interface
- dClient dynamic.Interface
- nsClient dynamic.NamespaceableResourceInterface
- mxsClient *versioned.Clientset
- cachedDiscovery *disk.CachedDiscoveryClient
- config *Config
- useMetricServer bool
- mx sync.Mutex
+ client kubernetes.Interface
+ dClient dynamic.Interface
+ nsClient dynamic.NamespaceableResourceInterface
+ mxsClient *versioned.Clientset
+ cachedClient *disk.CachedDiscoveryClient
+ config *Config
+ mx sync.Mutex
+ cache *cache.LRUExpireCache
}
// InitConnectionOrDie initialize connection from command line args.
// Checks for connectivity with the api server.
func InitConnectionOrDie(config *Config) *APIClient {
- conn := APIClient{config: config}
- conn.useMetricServer = conn.supportsMxServer()
+ a := APIClient{
+ config: config,
+ cache: cache.NewLRUExpireCache(cacheSize),
+ }
+ a.HasMetrics()
- return &conn
+ return &a
}
func makeSAR(ns, gvr string) *authorizationv1.SelfSubjectAccessReview {
@@ -66,24 +77,44 @@ func makeSAR(ns, gvr string) *authorizationv1.SelfSubjectAccessReview {
}
}
+func makeKey(ns, gvr string, vv []string) string {
+ return ns + ":" + gvr + "::" + strings.Join(vv, ",")
+}
+
// CanI checks if user has access to a certain resource.
func (a *APIClient) CanI(ns, gvr string, verbs []string) (bool, error) {
+ defer func(t time.Time) {
+ log.Debug().Msgf("AUTH elapsed %v", time.Since(t))
+ }(time.Now())
+
log.Debug().Msgf("AUTH %q:%q -- %v", ns, gvr, verbs)
sar := makeSAR(ns, gvr)
+
+ key := makeKey(ns, gvr, verbs)
+ if v, ok := a.cache.Get(key); ok {
+ if auth, ok := v.(bool); ok {
+ return auth, nil
+ }
+ }
+
dial := a.DialOrDie().AuthorizationV1().SelfSubjectAccessReviews()
for _, v := range verbs {
sar.Spec.ResourceAttributes.Verb = v
resp, err := dial.Create(sar)
if err != nil {
log.Warn().Err(err).Msgf(" Dial Failed!")
+ a.cache.Add(key, false, cacheExpiry)
return false, err
}
if !resp.Status.Allowed {
log.Debug().Msgf(" NO %q ;(", v)
+ a.cache.Add(key, false, cacheExpiry)
return false, fmt.Errorf("`%s access denied for user on %q:%s", v, ns, gvr)
}
}
+
log.Debug().Msgf(" YES!")
+ a.cache.Add(key, true, cacheExpiry)
return true, nil
}
@@ -94,12 +125,7 @@ func (a *APIClient) CurrentNamespaceName() (string, error) {
// ServerVersion returns the current server version info.
func (a *APIClient) ServerVersion() (*version.Info, error) {
- discovery, err := a.CachedDiscovery()
- if err != nil {
- return nil, err
- }
-
- return discovery.ServerVersion()
+ return a.CachedDiscoveryOrDie().ServerVersion()
}
// ValidNamespaces returns all available namespaces.
@@ -113,12 +139,7 @@ func (a *APIClient) ValidNamespaces() ([]v1.Namespace, error) {
// IsNamespaced check on server if given resource is namespaced
func (a *APIClient) IsNamespaced(res string) bool {
- discovery, err := a.CachedDiscovery()
- if err != nil {
- return false
- }
-
- list, _ := discovery.ServerPreferredResources()
+ list, _ := a.CachedDiscoveryOrDie().ServerPreferredResources()
for _, l := range list {
for _, r := range l.APIResources {
if r.Name == res {
@@ -131,12 +152,7 @@ func (a *APIClient) IsNamespaced(res string) bool {
// SupportsResource checks for resource supported version against the server.
func (a *APIClient) SupportsResource(group string) bool {
- discovery, err := a.CachedDiscovery()
- if err != nil {
- return false
- }
-
- list, err := discovery.ServerPreferredResources()
+ list, err := a.CachedDiscoveryOrDie().ServerPreferredResources()
if err != nil {
log.Error().Err(err).Msg("Unable to dial api server")
return false
@@ -157,7 +173,13 @@ func (a *APIClient) Config() *Config {
// HasMetrics returns true if the cluster supports metrics.
func (a *APIClient) HasMetrics() bool {
- return a.useMetricServer
+ v, ok := a.cache.Get(cacheMXKey)
+ if !ok {
+ return a.supportsMxServer()
+ }
+
+ flag, ok := v.(bool)
+ return ok && flag
}
// DialOrDie returns a handle to api server or die.
@@ -183,12 +205,12 @@ func (a *APIClient) RestConfigOrDie() *restclient.Config {
}
// CachedDiscovery returns a cached discovery client.
-func (a *APIClient) CachedDiscovery() (*disk.CachedDiscoveryClient, error) {
+func (a *APIClient) CachedDiscoveryOrDie() *disk.CachedDiscoveryClient {
a.mx.Lock()
defer a.mx.Unlock()
- if a.cachedDiscovery != nil {
- return a.cachedDiscovery, nil
+ if a.cachedClient != nil {
+ return a.cachedClient
}
rc := a.RestConfigOrDie()
@@ -196,8 +218,11 @@ func (a *APIClient) CachedDiscovery() (*disk.CachedDiscoveryClient, error) {
discCacheDir := filepath.Join(mustHomeDir(), ".kube", "cache", "discovery", toHostDir(rc.Host))
var err error
- a.cachedDiscovery, err = disk.NewCachedDiscoveryClientForConfig(rc, discCacheDir, httpCacheDir, 10*time.Minute)
- return a.cachedDiscovery, err
+ a.cachedClient, err = disk.NewCachedDiscoveryClientForConfig(rc, discCacheDir, httpCacheDir, 10*time.Minute)
+ if err != nil {
+ log.Panic().Msgf("Unable to connect to discovery client %v", err)
+ }
+ return a.cachedClient
}
// DynDialOrDie returns a handle to a dynamic interface.
@@ -237,12 +262,12 @@ func (a *APIClient) SwitchContextOrDie(ctx string) {
}
if currentCtx != ctx {
- a.cachedDiscovery = nil
+ a.cachedClient = nil
a.reset()
if err := a.config.SwitchContext(ctx); err != nil {
log.Fatal().Err(err).Msg("Switching context")
}
- a.useMetricServer = a.supportsMxServer()
+ _ = a.supportsMxServer()
}
}
@@ -253,27 +278,26 @@ func (a *APIClient) reset() {
a.client, a.dClient, a.nsClient, a.mxsClient = nil, nil, nil, nil
}
-func (a *APIClient) supportsMxServer() bool {
- discovery, err := a.CachedDiscovery()
- if err != nil {
- return false
- }
+func (a *APIClient) supportsMxServer() (supported bool) {
+ defer func() {
+ a.cache.Add(cacheMXKey, supported, cacheExpiry)
+ }()
- apiGroups, err := discovery.ServerGroups()
+ apiGroups, err := a.CachedDiscoveryOrDie().ServerGroups()
if err != nil {
- return false
+ return
}
-
for _, grp := range apiGroups.Groups {
if grp.Name != metricsapi.GroupName {
continue
}
if checkMetricsVersion(grp) {
- return true
+ supported = true
+ return
}
}
- return false
+ return
}
func checkMetricsVersion(grp metav1.APIGroup) bool {
@@ -290,16 +314,10 @@ func checkMetricsVersion(grp metav1.APIGroup) bool {
// SupportsRes checks latest supported version.
func (a *APIClient) SupportsRes(group string, versions []string) (string, bool, error) {
- discovery, err := a.CachedDiscovery()
+ apiGroups, err := a.CachedDiscoveryOrDie().ServerGroups()
if err != nil {
return "", false, err
}
-
- apiGroups, err := discovery.ServerGroups()
- if err != nil {
- return "", false, err
- }
-
for _, grp := range apiGroups.Groups {
if grp.Name != group {
continue
diff --git a/internal/client/gvr.go b/internal/client/gvr.go
index dbfac36f..df07c6bd 100644
--- a/internal/client/gvr.go
+++ b/internal/client/gvr.go
@@ -140,6 +140,9 @@ func (g GVRs) Less(i, j int) bool {
// Can determines the available actions for a given resource.
func Can(verbs []string, v string) bool {
+ if len(verbs) == 0 {
+ return true
+ }
for _, verb := range verbs {
candidates, err := mapVerb(v)
if err != nil {
diff --git a/internal/client/metrics.go b/internal/client/metrics.go
index bb2116cc..05947d99 100644
--- a/internal/client/metrics.go
+++ b/internal/client/metrics.go
@@ -1,6 +1,7 @@
package client
import (
+ "fmt"
"math"
v1 "k8s.io/api/core/v1"
@@ -70,33 +71,41 @@ func (m *MetricsServer) ClusterLoad(nos *v1.NodeList, nmx *mv1beta1.NodeMetricsL
// FetchNodesMetrics return all metrics for pods in a given namespace.
func (m *MetricsServer) FetchNodesMetrics() (*mv1beta1.NodeMetricsList, error) {
+ var mx mv1beta1.NodeMetricsList
+ if !m.HasMetrics() {
+ return &mx, fmt.Errorf("No metrics-server detected on cluster")
+ }
+
auth, err := m.CanI("", "metrics.k8s.io/v1beta1/nodes", []string{"list"})
if !auth || err != nil {
- return nil, err
+ return &mx, err
}
client, err := m.MXDial()
if err != nil {
- return nil, err
+ return &mx, err
}
-
return client.MetricsV1beta1().NodeMetricses().List(metav1.ListOptions{})
}
// FetchPodsMetrics return all metrics for pods in a given namespace.
func (m *MetricsServer) FetchPodsMetrics(ns string) (*mv1beta1.PodMetricsList, error) {
+ var mx mv1beta1.PodMetricsList
+ if !m.HasMetrics() {
+ return &mx, fmt.Errorf("No metrics-server detected on cluster")
+ }
if ns == NamespaceAll {
ns = AllNamespaces
}
auth, err := m.CanI(ns, "metrics.k8s.io/v1beta1/pods", []string{"list"})
if !auth || err != nil {
- return &mv1beta1.PodMetricsList{}, err
+ return &mx, err
}
client, err := m.MXDial()
if err != nil {
- return nil, err
+ return &mx, err
}
return client.MetricsV1beta1().PodMetricses(ns).List(metav1.ListOptions{})
@@ -104,17 +113,22 @@ func (m *MetricsServer) FetchPodsMetrics(ns string) (*mv1beta1.PodMetricsList, e
// FetchPodMetrics return all metrics for pods in a given namespace.
func (m *MetricsServer) FetchPodMetrics(ns, sel string) (*mv1beta1.PodMetrics, error) {
+ var mx mv1beta1.PodMetrics
+ if !m.HasMetrics() {
+ return &mx, fmt.Errorf("No metrics-server detected on cluster")
+ }
+
if ns == NamespaceAll {
ns = AllNamespaces
}
auth, err := m.CanI(ns, "metrics.k8s.io/v1beta1/pods", []string{"get"})
if !auth || err != nil {
- return nil, err
+ return &mx, err
}
client, err := m.MXDial()
if err != nil {
- return nil, err
+ return &mx, err
}
return client.MetricsV1beta1().PodMetricses(ns).Get(sel, metav1.GetOptions{})
diff --git a/internal/client/types.go b/internal/client/types.go
index c0f73fbe..0d18bf30 100644
--- a/internal/client/types.go
+++ b/internal/client/types.go
@@ -32,7 +32,7 @@ type Connection interface {
Config() *Config
DialOrDie() kubernetes.Interface
SwitchContextOrDie(ctx string)
- CachedDiscovery() (*disk.CachedDiscoveryClient, error)
+ CachedDiscoveryOrDie() *disk.CachedDiscoveryClient
RestConfigOrDie() *restclient.Config
MXDial() (*versioned.Clientset, error)
DynDialOrDie() dynamic.Interface
diff --git a/internal/config/mock_connection_test.go b/internal/config/mock_connection_test.go
index e988afa5..ac9b37c6 100644
--- a/internal/config/mock_connection_test.go
+++ b/internal/config/mock_connection_test.go
@@ -33,23 +33,19 @@ func NewMockConnection(options ...pegomock.Option) *MockConnection {
func (mock *MockConnection) SetFailHandler(fh pegomock.FailHandler) { mock.fail = fh }
func (mock *MockConnection) FailHandler() pegomock.FailHandler { return mock.fail }
-func (mock *MockConnection) CachedDiscovery() (*disk.CachedDiscoveryClient, error) {
+func (mock *MockConnection) CachedDiscoveryOrDie() *disk.CachedDiscoveryClient {
if mock == nil {
panic("mock must not be nil. Use myMock := NewMockConnection().")
}
params := []pegomock.Param{}
- result := pegomock.GetGenericMockFrom(mock).Invoke("CachedDiscovery", params, []reflect.Type{reflect.TypeOf((**disk.CachedDiscoveryClient)(nil)).Elem(), reflect.TypeOf((*error)(nil)).Elem()})
+ result := pegomock.GetGenericMockFrom(mock).Invoke("CachedDiscoveryOrDie", params, []reflect.Type{reflect.TypeOf((**disk.CachedDiscoveryClient)(nil)).Elem(), reflect.TypeOf((*error)(nil)).Elem()})
var ret0 *disk.CachedDiscoveryClient
- var ret1 error
if len(result) != 0 {
if result[0] != nil {
ret0 = result[0].(*disk.CachedDiscoveryClient)
}
- if result[1] != nil {
- ret1 = result[1].(error)
- }
}
- return ret0, ret1
+ return ret0
}
func (mock *MockConnection) CanI(_param0 string, _param1 string, _param2 []string) (bool, error) {
diff --git a/internal/dao/crd.go b/internal/dao/crd.go
index a7b29155..18ff56f6 100644
--- a/internal/dao/crd.go
+++ b/internal/dao/crd.go
@@ -27,10 +27,5 @@ func (c *CustomResourceDefinition) List(ctx context.Context, _ string) ([]runtim
}
const gvr = "apiextensions.k8s.io/v1beta1/customresourcedefinitions"
- oo, err := c.Factory.List(gvr, "-", true, lsel)
- if err != nil {
- return nil, err
- }
-
- return oo, nil
+ return c.Factory.List(gvr, "-", true, lsel)
}
diff --git a/internal/dao/generic.go b/internal/dao/generic.go
index 96cffd78..bb7aea4e 100644
--- a/internal/dao/generic.go
+++ b/internal/dao/generic.go
@@ -22,8 +22,9 @@ type Generic struct {
}
// List returns a collection of resources.
+// BOZO!! no auth check??
func (g *Generic) List(ctx context.Context, ns string) ([]runtime.Object, error) {
- log.Debug().Msgf("GENERIC LIST %q:%q", ns, g.gvr)
+ log.Debug().Msgf("GENERIC-LIST %q:%q", ns, g.gvr)
labelSel, ok := ctx.Value(internal.KeyLabels).(string)
if !ok {
log.Warn().Msgf("No label selector found in context. Listing all resources")
diff --git a/internal/dao/node.go b/internal/dao/node.go
index fc9d6570..7964256e 100644
--- a/internal/dao/node.go
+++ b/internal/dao/node.go
@@ -27,6 +27,8 @@ type Node struct {
// List returns a collection of node resources.
func (n *Node) List(ctx context.Context, ns string) ([]runtime.Object, error) {
+ log.Debug().Msgf("NODE-LIST %q:%q", ns, n.gvr)
+
nmx, ok := ctx.Value(internal.KeyMetrics).(*mv1beta1.NodeMetricsList)
if !ok {
log.Warn().Msgf("No node metrics available in context")
diff --git a/internal/dao/registry.go b/internal/dao/registry.go
index aae5b837..f4cad67f 100644
--- a/internal/dao/registry.go
+++ b/internal/dao/registry.go
@@ -187,11 +187,7 @@ func loadRBAC(m ResourceMetas) {
}
func loadPreferred(f Factory, m ResourceMetas) error {
- discovery, err := f.Client().CachedDiscovery()
- if err != nil {
- return err
- }
- rr, err := discovery.ServerPreferredResources()
+ rr, err := f.Client().CachedDiscoveryOrDie().ServerPreferredResources()
if err != nil {
log.Warn().Err(err).Msgf("Failed to load preferred resources")
}
diff --git a/internal/dao/resource.go b/internal/dao/resource.go
index 58da91bf..07d12579 100644
--- a/internal/dao/resource.go
+++ b/internal/dao/resource.go
@@ -5,6 +5,7 @@ import (
"fmt"
"github.com/derailed/k9s/internal"
+ "github.com/rs/zerolog/log"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
)
@@ -20,6 +21,23 @@ type Resource struct {
Generic
}
+// List returns a collection of resources.
+func (r *Resource) List(ctx context.Context, ns string) ([]runtime.Object, error) {
+ log.Debug().Msgf("INF-LIST %q:%q", ns, r.gvr)
+ strLabel, ok := ctx.Value(internal.KeyLabels).(string)
+ lsel := labels.Everything()
+ if sel, err := labels.ConvertSelectorToLabelsMap(strLabel); ok && err == nil {
+ lsel = sel.AsSelector()
+ }
+
+ return r.Factory.List(r.gvr.String(), ns, false, lsel)
+}
+
+// Get returns a resource instance if found, else an error.
+func (r *Resource) Get(ctx context.Context, path string) (runtime.Object, error) {
+ return r.Factory.Get(r.gvr.String(), path, true, labels.Everything())
+}
+
// ToYAML returns a resource yaml.
func (r *Resource) ToYAML(path string) (string, error) {
o, err := r.Get(context.Background(), path)
@@ -33,19 +51,3 @@ func (r *Resource) ToYAML(path string) (string, error) {
}
return raw, nil
}
-
-// Get returns a resource instance if found, else an error.
-func (r *Resource) Get(ctx context.Context, path string) (runtime.Object, error) {
- return r.Factory.Get(r.gvr.String(), path, true, labels.Everything())
-}
-
-// List returns a collection of resources.
-func (r *Resource) List(ctx context.Context, ns string) ([]runtime.Object, error) {
- strLabel, ok := ctx.Value(internal.KeyLabels).(string)
- lsel := labels.Everything()
- if sel, err := labels.ConvertSelectorToLabelsMap(strLabel); ok && err == nil {
- lsel = sel.AsSelector()
- }
-
- return r.Factory.List(r.gvr.String(), ns, false, lsel)
-}
diff --git a/internal/dao/rest_mapper.go b/internal/dao/rest_mapper.go
index 915a71cf..66485c27 100644
--- a/internal/dao/rest_mapper.go
+++ b/internal/dao/rest_mapper.go
@@ -20,12 +20,10 @@ type RestMapper struct {
// ToRESTMapper map resources to kind, and map kind and version to interfaces for manipulating K8s objects.
func (r *RestMapper) ToRESTMapper() (meta.RESTMapper, error) {
- disc, err := r.CachedDiscovery()
- if err != nil {
- return nil, err
- }
- mapper := restmapper.NewDeferredDiscoveryRESTMapper(disc)
- expander := restmapper.NewShortcutExpander(mapper, disc)
+ dial := r.CachedDiscoveryOrDie()
+ mapper := restmapper.NewDeferredDiscoveryRESTMapper(dial)
+ expander := restmapper.NewShortcutExpander(mapper, dial)
+
return expander, nil
}
diff --git a/internal/dao/table.go b/internal/dao/table.go
index d7a82e56..ce4c8e11 100644
--- a/internal/dao/table.go
+++ b/internal/dao/table.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
+ "github.com/rs/zerolog/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
@@ -18,6 +19,7 @@ type Table struct {
// List all Resources in a given namespace.
func (t *Table) List(ctx context.Context, ns string) ([]runtime.Object, error) {
+ log.Debug().Msgf("TABLE-LIST %q:%q", ns, t.gvr)
a := fmt.Sprintf(gvFmt, metav1beta1.SchemeGroupVersion.Version, metav1beta1.GroupName)
_, codec := t.codec()
diff --git a/internal/model/registry.go b/internal/model/registry.go
index 90d82a27..2a606788 100644
--- a/internal/model/registry.go
+++ b/internal/model/registry.go
@@ -73,6 +73,7 @@ var Registry = map[string]ResourceMeta{
Renderer: &render.Node{},
},
"v1/services": {
+ DAO: &dao.Service{},
Renderer: &render.Service{},
},
"v1/serviceaccounts": {
@@ -87,15 +88,18 @@ var Registry = map[string]ResourceMeta{
// Apps...
"apps/v1/deployments": {
+ DAO: &dao.Deployment{},
Renderer: &render.Deployment{},
},
"apps/v1/replicasets": {
Renderer: &render.ReplicaSet{},
},
"apps/v1/statefulsets": {
+ DAO: &dao.StatefulSet{},
Renderer: &render.StatefulSet{},
},
"apps/v1/daemonsets": {
+ DAO: &dao.DaemonSet{},
Renderer: &render.DaemonSet{},
},
@@ -115,6 +119,7 @@ var Registry = map[string]ResourceMeta{
// Batch...
"batch/v1beta1/cronjobs": {
+ DAO: &dao.CronJob{},
Renderer: &render.CronJob{},
},
"batch/v1/jobs": {
@@ -138,11 +143,13 @@ var Registry = map[string]ResourceMeta{
// CRDs...
"apiextensions.k8s.io/v1/customresourcedefinitions": {
- DAO: &dao.CustomResourceDefinition{},
+ // BOZO!!
+ // DAO: &dao.CustomResourceDefinition{},
Renderer: &render.CustomResourceDefinition{},
},
"apiextensions.k8s.io/v1beta1/customresourcedefinitions": {
- DAO: &dao.CustomResourceDefinition{},
+ // BOZO!!
+ // DAO: &dao.CustomResourceDefinition{},
Renderer: &render.CustomResourceDefinition{},
},
diff --git a/internal/model/table.go b/internal/model/table.go
index 525dd7d6..1b5767ef 100644
--- a/internal/model/table.go
+++ b/internal/model/table.go
@@ -193,8 +193,8 @@ func (t *Table) refresh(ctx context.Context) {
}
func (t *Table) list(ctx context.Context, a dao.Accessor) ([]runtime.Object, error) {
- defer func(t time.Time) {
- log.Debug().Msgf(" LIST elapsed %v", time.Since(t))
+ defer func(ti time.Time) {
+ log.Debug().Msgf(" LIST %q:%q elapsed %v", t.namespace, t.gvr, time.Since(ti))
}(time.Now())
factory, ok := ctx.Value(internal.KeyFactory).(dao.Factory)
@@ -207,8 +207,8 @@ func (t *Table) list(ctx context.Context, a dao.Accessor) ([]runtime.Object, err
}
func (t *Table) reconcile(ctx context.Context) error {
- defer func(t time.Time) {
- log.Debug().Msgf("RECONCILE elapsed %v", time.Since(t))
+ defer func(ti time.Time) {
+ log.Debug().Msgf("RECONCILE %q:%q elapsed %v", t.namespace, t.gvr, time.Since(ti))
}(time.Now())
meta := t.resourceMeta()
diff --git a/internal/ui/config.go b/internal/ui/config.go
index ba54f618..8c04f158 100644
--- a/internal/ui/config.go
+++ b/internal/ui/config.go
@@ -71,7 +71,7 @@ func (c *Configurator) StylesUpdater(ctx context.Context, s synchronizer) error
func (c *Configurator) InitBench(cluster string) {
var err error
if c.Bench, err = config.NewBench(BenchConfig(cluster)); err != nil {
- log.Info().Err(err).Msg("No benchmark config file found, using defaults.")
+ log.Info().Msg("No benchmark config file found, using defaults.")
}
}
diff --git a/internal/view/app.go b/internal/view/app.go
index 406fc9c3..ddce722a 100644
--- a/internal/view/app.go
+++ b/internal/view/app.go
@@ -22,6 +22,8 @@ const (
splashTime = 1
clusterRefresh = time.Duration(5 * time.Second)
statusIndicatorFmt = "[orange::b]K9s [aqua::]%s [white::]%s:%s:%s [lawngreen::]%s%%[white::]::[darkturquoise::]%s%%"
+ clusterInfoWidth = 50
+ clusterInfoPad = 15
)
// App represents an application view.
@@ -136,7 +138,16 @@ func (a *App) buildHeader() tview.Primitive {
if !a.showHeader {
return header
}
- header.AddItem(a.clusterInfo(), 40, 1, false)
+
+ clWidth := clusterInfoWidth
+ n, err := a.Conn().Config().CurrentClusterName()
+ if err == nil {
+ size := len(n) + clusterInfoPad
+ if size > clWidth {
+ clWidth = size
+ }
+ }
+ header.AddItem(a.clusterInfo(), clWidth, 1, false)
header.AddItem(a.Menu(), 0, 1, false)
header.AddItem(a.Logo(), 26, 1, false)
diff --git a/internal/view/node.go b/internal/view/node.go
index b204250c..78d07152 100644
--- a/internal/view/node.go
+++ b/internal/view/node.go
@@ -41,6 +41,10 @@ func (n *Node) bindKeys(aa ui.KeyActions) {
}
func (n *Node) nodeContext(ctx context.Context) context.Context {
+ if !n.App().Conn().HasMetrics() {
+ return ctx
+ }
+
mx := client.NewMetricsServer(n.App().factory.Client())
nmx, err := mx.FetchNodesMetrics()
if err != nil {
diff --git a/internal/watch/factory.go b/internal/watch/factory.go
index 9f526a01..f007dd17 100644
--- a/internal/watch/factory.go
+++ b/internal/watch/factory.go
@@ -62,6 +62,10 @@ func (f *Factory) Terminate() {
// List returns a resource collection.
func (f *Factory) List(gvr, ns string, wait bool, labels labels.Selector) ([]runtime.Object, error) {
+ defer func(t time.Time) {
+ log.Debug().Msgf("FACTORY-LIST %q::%q elapsed %v", ns, gvr, time.Since(t))
+ }(time.Now())
+
if ns == clusterScope {
ns = allNamespaces
}