Skip to content

Commit 7fbfca2

Browse files
authored
Merge branch 'master' into tyzbit/quick-return
2 parents 0e457f9 + 8e1a29f commit 7fbfca2

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
cache-dependency-path: go.sum
1919

2020
- name: Lint
21-
uses: golangci/golangci-lint-action@v6.0.1
21+
uses: golangci/golangci-lint-action@v6.1.0
2222
with:
2323
github_token: ${{ secrets.GITHUB_TOKEN }}
2424
reporter: github-pr-check

Dockerfile

+1-1
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.21.5-alpine3.17 AS build
4+
FROM golang:1.22-alpine3.20 AS build
55

66
WORKDIR /k9s
77
COPY go.mod go.sum main.go Makefile ./

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ K9s uses aliases to navigate most K8s resources.
341341
| Show active keyboard mnemonics and help | `?` | |
342342
| Show all available resource alias | `ctrl-a` | |
343343
| To bail out of K9s | `:quit`, `:q`, `ctrl-c` | |
344+
| To go up/back to the previous view | `esc` | If you have crumbs on, this will go to the previous one |
344345
| View a Kubernetes resource using singular/plural or short-name | `:`pod⏎ | accepts singular, plural, short-name or alias ie pod or pods |
345346
| View a Kubernetes resource in a given namespace | `:`pod ns-x⏎ | |
346347
| View filtered pods (New v0.30.0!) | `:`pod /fred⏎ | View all pods filtered by fred |

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ require (
102102
github.com/distribution/reference v0.6.0 // indirect
103103
github.com/docker/cli v25.0.1+incompatible // indirect
104104
github.com/docker/distribution v2.8.3+incompatible // indirect
105-
github.com/docker/docker v26.0.1+incompatible // indirect
105+
github.com/docker/docker v26.1.4+incompatible // indirect
106106
github.com/docker/docker-credential-helpers v0.7.0 // indirect
107107
github.com/docker/go-connections v0.5.0 // indirect
108108
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbT
404404
github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
405405
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
406406
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
407-
github.com/docker/docker v26.0.1+incompatible h1:t39Hm6lpXuXtgkF0dm1t9a5HkbUfdGy6XbWexmGr+hA=
408-
github.com/docker/docker v26.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
407+
github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
408+
github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
409409
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
410410
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
411411
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

0 commit comments

Comments
 (0)