diff --git a/README.md b/README.md index 2f337eda..b0177c21 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ K9s uses aliases to navigate most K8s resources. | To delete a resource (TAB and ENTER to confirm) | `ctrl-d` | | | To kill a resource (no confirmation dialog!) | `ctrl-k` | | | Launch pulses view | `:`pulses or pu⏎ | | -| Launch XRay view | `:`xray pod⏎ | accepts po, svc, dp, rs, sts or ds | +| Launch XRay view | `:`xray RESOURCE [NAMESPACE]⏎ | RESOURCE can be one of po, svc, dp, rs, sts, ds, NAMESPACE is optional | --- diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 013d9648..d255a01e 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -269,6 +269,8 @@ var expectedConfig = `k9s: buffer: 800 sinceSeconds: -1 fullScreenLogs: false + textWrap: false + showTime: false currentContext: blee currentCluster: blee clusters: @@ -320,6 +322,8 @@ var resetConfig = `k9s: buffer: 2000 sinceSeconds: -1 fullScreenLogs: false + textWrap: false + showTime: false currentContext: blee currentCluster: blee clusters: diff --git a/internal/config/logger.go b/internal/config/logger.go index be3fee73..66f0d1bb 100644 --- a/internal/config/logger.go +++ b/internal/config/logger.go @@ -19,6 +19,8 @@ type Logger struct { BufferSize int `yaml:"buffer"` SinceSeconds int64 `yaml:"sinceSeconds"` FullScreenLogs bool `yaml:"fullScreenLogs"` + TextWrap bool `yaml:"textWrap"` + ShowTime bool `yaml:"showTime"` } // NewLogger returns a new instance. diff --git a/internal/view/log.go b/internal/view/log.go index 344a4dce..9242a3fa 100644 --- a/internal/view/log.go +++ b/internal/view/log.go @@ -76,7 +76,7 @@ func (l *Log) Init(ctx context.Context) (err error) { } l.logs.SetBorderPadding(0, 0, 1, 1) l.logs.SetText(logMessage) - l.logs.SetWrap(false) + l.logs.SetWrap(l.app.Config.K9s.Logger.TextWrap) l.logs.SetMaxBuffer(l.app.Config.K9s.Logger.BufferSize) l.logs.cmdBuff.AddListener(l) diff --git a/internal/view/log_indicator.go b/internal/view/log_indicator.go index 93e01d8f..5696a0b4 100644 --- a/internal/view/log_indicator.go +++ b/internal/view/log_indicator.go @@ -26,6 +26,8 @@ func NewLogIndicator(cfg *config.Config, styles *config.Styles) *LogIndicator { TextView: tview.NewTextView(), scrollStatus: 1, fullScreen: cfg.K9s.Logger.FullScreenLogs, + textWrap: cfg.K9s.Logger.TextWrap, + showTime: cfg.K9s.Logger.ShowTime, } l.StylesChanged(styles) styles.AddListener(&l)