diff --git a/Makefile b/Makefile index d4fb7c57..1199104b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PACKAGE := github.com/derailed/$(NAME) GIT_REV ?= $(shell git rev-parse --short HEAD) SOURCE_DATE_EPOCH ?= $(shell date +%s) DATE ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ") -VERSION ?= v0.25.13 +VERSION ?= v0.25.14 IMG_NAME := derailed/k9s IMAGE := ${IMG_NAME}:${VERSION} diff --git a/change_logs/release_v0.25.14.md b/change_logs/release_v0.25.14.md new file mode 100644 index 00000000..ff788ea8 --- /dev/null +++ b/change_logs/release_v0.25.14.md @@ -0,0 +1,27 @@ + + +# Release v0.25.14 + +## 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 are as ever very much noted and appreciated! + +If you feel K9s is helping your Kubernetes journey, please consider joining our [sponsorship program](https://github.com/sponsors/derailed) and/or make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer) + +On Slack? Please join us [K9slackers](https://join.slack.com/t/k9sers/shared_invite/enQtOTA5MDEyNzI5MTU0LWQ1ZGI3MzliYzZhZWEyNzYxYzA3NjE0YTk1YmFmNzViZjIyNzhkZGI0MmJjYzhlNjdlMGJhYzE2ZGU1NjkyNTM) + +--- + +## Maintenance Release! + +Doh! Hot fix on the way... + +--- + +## Resolved Issues + +* [Issue #1384](https://github.com/derailed/k9s/issues/1384) Leaving Logs View Causes Crash: "panic: send on closed channel" + +--- + + © 2021 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/internal/dao/pod.go b/internal/dao/pod.go index 866d6122..e789c046 100644 --- a/internal/dao/pod.go +++ b/internal/dao/pod.go @@ -391,12 +391,14 @@ func readLogs(ctx context.Context, stream io.ReadCloser, c LogChan, opts *LogOpt } } select { + case <-ctx.Done(): + close(c) + return case c <- item: if item.IsError { + close(c) return } - case <-ctx.Done(): - return } } } diff --git a/internal/view/log.go b/internal/view/log.go index 445d37a9..4a67fe93 100644 --- a/internal/view/log.go +++ b/internal/view/log.go @@ -225,10 +225,6 @@ func (l *Log) Stop() { l.cancelFn() l.cancelFn = nil } - if l.logChan != nil { - close(l.logChan) - l.logChan = nil - } } l.mx.Unlock() l.app.Styles.RemoveListener(l)