Skip to content

Commit 0c6ecc6

Browse files
committed
Merge branch 'master' of github.com:derailed/k9s into feat/json-log
* 'master' of github.com:derailed/k9s: (130 commits) added flux suspended resources retrieval plugin (derailed#1584) Provide white blur so images work in dark modes (derailed#1597) Add context to get-all (derailed#1701) fix brew command in the readme (derailed#2012) Add support for using custom kubeconfig with log_full plugin (derailed#2014) feat: allow for multiple plugin files in $XDG_DATA_DIRS/k9s/plugins (derailed#2029) Clean up issues introduced by derailed#2125 (derailed#2289) Pod view resembles more the output of kubectl get pods -o wide (derailed#2125) Update README.md with snap install (derailed#2262) Add snapcraft config (derailed#2123) storageclasses view keeps the same output as kubectl get sc (derailed#2132) Fix merge issues with PR derailed#2168 (derailed#2288) Add colour config for container picker (derailed#2140) Add env var to disable node pod counts (derailed#2168) Use current k9s NS if new context has no default NS (derailed#2197) Bump actions/setup-go from 4.0.1 to 4.1.0 (derailed#2200) fix: trigger a single log refresh after changing 'since' (derailed#2202) Add crossplane plugin (derailed#2204) fix(derailed#1359): add option to keep missing clusters in config (derailed#2213) K9s release v0.28.2 ...
2 parents 19e56aa + 91de8e1 commit 0c6ecc6

File tree

145 files changed

+3381
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+3381
-1289
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ jobs:
1515
build:
1616
runs-on: ubuntu-20.04
1717
steps:
18+
- name: Checkout Code
19+
uses: actions/[email protected]
20+
1821
- name: Install Go
19-
uses: actions/setup-go@v3.5.0
22+
uses: actions/setup-go@v4.1.0
2023
with:
21-
go-version: 1.19
24+
go-version-file: go.mod
25+
cache-dependency-path: go.sum
2226

2327
- name: Setup GO env
2428
run: go env -w CGO_ENABLED=0
2529

26-
- name: Checkout Code
27-
uses: actions/[email protected]
28-
2930
- name: Run Tests
3031
run: make test
3132
env:

.golangci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ linters-settings:
365365

366366
gosimple:
367367
# Select the Go version to target. The default is '1.13'.
368-
go: "1.15"
368+
go: "1.20"
369369
# https://staticcheck.io/docs/options#checks
370370
checks: ["all"]
371371

@@ -515,13 +515,13 @@ linters-settings:
515515

516516
staticcheck:
517517
# Select the Go version to target. The default is '1.13'.
518-
go: "1.15"
518+
go: "1.20"
519519
# https://staticcheck.io/docs/options#checks
520520
checks: ["all"]
521521

522522
stylecheck:
523523
# Select the Go version to target. The default is '1.13'.
524-
go: "1.15"
524+
go: "1.20"
525525
# https://staticcheck.io/docs/options#checks
526526
checks:
527527
["all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022"]
@@ -616,7 +616,7 @@ linters-settings:
616616

617617
unused:
618618
# Select the Go version to target. The default is '1.13'.
619-
go: "1.15"
619+
go: "1.20"
620620

621621
whitespace:
622622
multi-if: false # Enforces newlines (or comments) after every multi-line if statement

.goreleaser.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ archives:
3333
bit: Arm
3434
bitv6: Arm6
3535
bitv7: Arm7
36+
format_overrides:
37+
- goos: windows
38+
format: zip
3639
checksum:
37-
name_template: "checksums.txt"
40+
name_template: "checksums.sha256"
3841
snapshot:
3942
name_template: "{{ .Tag }}-next"
4043
changelog:

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# The base image for building the k9s binary
33

4-
FROM golang:1.20.0-alpine3.16 AS build
4+
FROM golang:1.20.4-alpine3.16 AS build
55

66
WORKDIR /k9s
77
COPY go.mod go.sum main.go Makefile ./
@@ -12,13 +12,14 @@ RUN apk --no-cache add --update make libx11-dev git gcc libc-dev curl && make bu
1212
# -----------------------------------------------------------------------------
1313
# Build the final Docker image
1414

15-
FROM alpine:3.17.1
15+
FROM alpine:3.18.4
1616
ARG KUBECTL_VERSION="v1.25.2"
1717

1818
COPY --from=build /k9s/execs/k9s /bin/k9s
1919
RUN apk add --update ca-certificates \
2020
&& apk add --update -t deps curl vim \
21-
&& curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
21+
&& TARGET_ARCH=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
22+
&& curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGET_ARCH}/kubectl -o /usr/local/bin/kubectl \
2223
&& chmod +x /usr/local/bin/kubectl \
2324
&& apk del --purge deps \
2425
&& rm /var/cache/apk/*

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DATE ?= $(shell TZ=UTC date -j -f "%s" ${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:
1111
else
1212
DATE ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ")
1313
endif
14-
VERSION ?= v0.27.3
14+
VERSION ?= v0.28.2
1515
IMG_NAME := derailed/k9s
1616
IMAGE := ${IMG_NAME}:${VERSION}
1717

README.md

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,19 @@ K9s is available on Linux, macOS and Windows platforms.
4848
* Via [Homebrew](https://brew.sh/) for macOS or Linux
4949

5050
```shell
51-
brew install derailed/k9s/k9s
51+
brew install k9s
5252
```
5353

5454
* Via [MacPorts](https://www.macports.org)
5555

5656
```shell
5757
sudo port install k9s
5858
```
59+
* Via [snap](https://snapcraft.io/k9s) for Linux
60+
61+
```shell
62+
snap install k9s --devmode
63+
```
5964

6065
* On Arch Linux
6166

@@ -69,6 +74,17 @@ K9s is available on Linux, macOS and Windows platforms.
6974
zypper install k9s
7075
```
7176

77+
* On FreeBSD
78+
79+
```shell
80+
pkg install k9s
81+
```
82+
83+
* Via [Winget](https://github.com/microsoft/winget-cli) for Windows
84+
```shell
85+
winget install k9s
86+
```
87+
7288
* Via [Scoop](https://scoop.sh) for Windows
7389

7490
```shell
@@ -186,6 +202,7 @@ K9s is available on Linux, macOS and Windows platforms.
186202

187203
| k9s | k8s client |
188204
| ------------------ | ---------- |
205+
| >= v0.27.0 | 0.26.1 |
189206
| v0.26.7 - v0.26.6 | 0.25.3 |
190207
| v0.26.5 - v0.26.4 | 0.25.1 |
191208
| v0.26.3 - v0.26.1 | 0.24.3 |
@@ -253,8 +270,8 @@ K9s uses aliases to navigate most K8s resources.
253270
| Fuzzy find a resource given a filter | `/`-f filter⏎ | |
254271
| Bails out of view/command/filter mode | `<esc>` | |
255272
| Key mapping to describe, view, edit, view logs,... | `d`,`v`, `e`, `l`,... | |
256-
| To view and switch to another Kubernetes context | `:`ctx⏎ | |
257-
| To view and switch to another Kubernetes context | `:`ctx context-name⏎ | |
273+
| To view and switch to another Kubernetes context (Pod view) | `:`ctx⏎ | |
274+
| To view and switch directly to another Kubernetes context (Last used view) | `:`ctx context-name⏎ | |
258275
| To view and switch to another Kubernetes namespace | `:`ns⏎ | |
259276
| To view all saved resources | `:`screendump or sd⏎ | |
260277
| To delete a resource (TAB and ENTER to confirm) | `ctrl-d` | |
@@ -307,6 +324,8 @@ K9s uses aliases to navigate most K8s resources.
307324
```yaml
308325
# $XDG_CONFIG_HOME/k9s/config.yml
309326
k9s:
327+
# Enable periodic refresh of resource browser windows. Default false
328+
liveViewAutoRefresh: false
310329
# Represents ui poll intervals. Default 2secs
311330
refreshRate: 2
312331
# Number of retries once the connection to the api-server is lost. Default 15.
@@ -345,6 +364,8 @@ K9s uses aliases to navigate most K8s resources.
345364
currentContext: minikube
346365
# Indicates the current kube cluster. Defaults to current context cluster
347366
currentCluster: minikube
367+
# KeepMissingClusters will keep clusters in the config if they are missing from the current kubeconfig file. Default false
368+
KeepMissingClusters: false
348369
# Persists per cluster preferences for favorite namespaces and view.
349370
clusters:
350371
coolio:
@@ -861,8 +882,13 @@ k9s:
861882
valueColor: royalblue
862883
# Logs styles.
863884
logs:
864-
fgColor: white
885+
fgColor: lightskyblue
865886
bgColor: black
887+
indicator:
888+
fgColor: dodgerblue
889+
bgColor: black
890+
toggleOnColor: limegreen
891+
toggleOffColor: gray
866892
```
867893

868894
---
@@ -903,6 +929,8 @@ to make this project a reality!
903929
* <img src="assets/mail.png" width="16" height="auto" alt="email"/> [email protected]
904930
* <img src="assets/twitter.png" width="16" height="auto" alt="twitter"/> [@kitesurfer](https://twitter.com/kitesurfer?lang=en)
905931

932+
* [Aleksei Romanenko](https://github.com/slimus)
933+
906934
We always enjoy hearing from folks who benefit from our work!
907935

908936
## Contributions Guideline

assets/k9s-xmas.png

65 KB
Loading

assets/k9s.png

45.5 KB
Loading

assets/k9s_err.png

16.6 KB
Loading

assets/k9s_helm.png

9.02 KB
Loading

0 commit comments

Comments
 (0)