From e93209a5486262f6bb2f5078cda3685d54e86d63 Mon Sep 17 00:00:00 2001 From: darklore Date: Fri, 11 Sep 2020 16:39:51 +0900 Subject: [PATCH 1/4] Fix default value of k9s.logger.sinceSeconds same as readme --- internal/config/config_test.go | 4 ++-- internal/config/logger.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/config_test.go b/internal/config/config_test.go index b57aa88e..3fe0b58e 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -267,7 +267,7 @@ var expectedConfig = `k9s: logger: tail: 500 buffer: 800 - sinceSeconds: 5 + sinceSeconds: 300 fullScreenLogs: false textWrap: false showTime: false @@ -347,7 +347,7 @@ var resetConfig = `k9s: logger: tail: 200 buffer: 2000 - sinceSeconds: 5 + sinceSeconds: 300 fullScreenLogs: false textWrap: false showTime: false diff --git a/internal/config/logger.go b/internal/config/logger.go index 1dc05d15..992222ca 100644 --- a/internal/config/logger.go +++ b/internal/config/logger.go @@ -10,7 +10,7 @@ const ( // MaxLogThreshold sets the max value for log size. MaxLogThreshold = 5000 // DefaultSinceSeconds tracks default log age. - DefaultSinceSeconds = 5 // all logs + DefaultSinceSeconds = 300 ) // Logger tracks logger options From 59f9fd435ea0ca3b6d3e764ccccf77c42cc7fbd3 Mon Sep 17 00:00:00 2001 From: Frits van Bommel Date: Sun, 13 Sep 2020 15:36:30 +0200 Subject: [PATCH 2/4] Migrate to new sortorder import path See fvbommel/util#7 --- go.mod | 2 +- go.sum | 5 ++--- internal/client/gvr.go | 2 +- internal/render/row.go | 2 +- internal/xray/tree_node.go | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 601d53f2..1f57d7a3 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/drone/envsubst v1.0.2 // indirect github.com/fatih/color v1.9.0 github.com/fsnotify/fsnotify v1.4.7 + github.com/fvbommel/sortorder v1.0.1 github.com/gdamore/tcell v1.3.0 github.com/ghodss/yaml v1.0.0 github.com/golang/protobuf v1.4.2 // indirect @@ -40,5 +41,4 @@ require ( k8s.io/metrics v0.18.8 rsc.io/letsencrypt v0.0.3 // indirect sigs.k8s.io/yaml v1.2.0 - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 ) diff --git a/go.sum b/go.sum index 39eaecd9..41cb4a3a 100644 --- a/go.sum +++ b/go.sum @@ -207,6 +207,8 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= +github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= @@ -916,6 +918,3 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnM sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/internal/client/gvr.go b/internal/client/gvr.go index 0c49b652..761e20c9 100644 --- a/internal/client/gvr.go +++ b/internal/client/gvr.go @@ -5,10 +5,10 @@ import ( "path" "strings" + "github.com/fvbommel/sortorder" "github.com/rs/zerolog/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "vbom.ml/util/sortorder" ) // GVR represents a kubernetes resource schema as a string. diff --git a/internal/render/row.go b/internal/render/row.go index dcafd20e..d974837d 100644 --- a/internal/render/row.go +++ b/internal/render/row.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "vbom.ml/util/sortorder" + "github.com/fvbommel/sortorder" ) // Fields represents a collection of row fields. diff --git a/internal/xray/tree_node.go b/internal/xray/tree_node.go index b9d744d3..b3b34ded 100644 --- a/internal/xray/tree_node.go +++ b/internal/xray/tree_node.go @@ -8,8 +8,8 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/dao" + "github.com/fvbommel/sortorder" "github.com/rs/zerolog/log" - "vbom.ml/util/sortorder" ) const ( From 7c1fc768789df367dc081f4d78880285124d535e Mon Sep 17 00:00:00 2001 From: Torjus Eidet Date: Mon, 14 Sep 2020 20:48:06 +0200 Subject: [PATCH 3/4] Changed character used for X The character used as an X in the RBAC overview does not work on Windows, even with patched powerline/nerd fonts. --- internal/render/rbac.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/render/rbac.go b/internal/render/rbac.go index 24dde086..895d3c59 100644 --- a/internal/render/rbac.go +++ b/internal/render/rbac.go @@ -101,7 +101,7 @@ func toVerbIcon(ok bool) string { if ok { return "[green::b] ✓ [::]" } - return "[orangered::b] 𐄂 [::]" + return "[orangered::b] × [::]" } func hasVerb(verbs []string, verb string) bool { From 6f0f69302fd08d0aeba1ed11d7516ea32d224554 Mon Sep 17 00:00:00 2001 From: Torjus Eidet Date: Mon, 14 Sep 2020 20:53:16 +0200 Subject: [PATCH 4/4] Update policy_test.go Updated test too --- internal/render/policy_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/render/policy_test.go b/internal/render/policy_test.go index 24408821..1d39fc06 100644 --- a/internal/render/policy_test.go +++ b/internal/render/policy_test.go @@ -31,11 +31,11 @@ func TestPolicyRender(t *testing.T) { "[green::b] ✓ [::]", "[green::b] ✓ [::]", "[green::b] ✓ [::]", - "[orangered::b] 𐄂 [::]", - "[orangered::b] 𐄂 [::]", - "[orangered::b] 𐄂 [::]", - "[orangered::b] 𐄂 [::]", - "[orangered::b] 𐄂 [::]", + "[orangered::b] × [::]", + "[orangered::b] × [::]", + "[orangered::b] × [::]", + "[orangered::b] × [::]", + "[orangered::b] × [::]", "", "", }, r.Fields)