kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99575 from navist2020/fix/logs_info 

Simply modify the Kubectl logs information

Kubernetes-commit: 635f2c7c2a3629a749e6332b3c5bae79ae3a469e
This commit is contained in:
Kubernetes Publisher 2021-06-03 23:25:25 -07:00
parent 9d5a96d7fb 537227dc43
commit 2af46a5f18
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -988,7 +988,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1e82f3b632c6"
"Rev": "a5103dee7e72"
},
{
"ImportPath": "k8s.io/cli-runtime",

4
go.mod
View File

@ -32,7 +32,7 @@ require (
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/apimachinery v0.0.0-20210604074431-a5103dee7e72
k8s.io/cli-runtime v0.0.0-20210604080617-23de5b2aa764
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
@ -48,7 +48,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604074431-a5103dee7e72
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210604080617-23de5b2aa764
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9

4
go.sum
View File

@ -683,8 +683,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb h1:bjPb0/AjLmHbYb+sYorOHImcVSqA+dMsHqYjPbfBmNQ=
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb/go.mod h1:G/aFk75uPvZtPzIzRb9OjwlDQCp9fVTsMnh1+PICcQc=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRKnexm0pPua15G2Aos6hFeg=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
k8s.io/apimachinery v0.0.0-20210604074431-a5103dee7e72 h1:AbQn6wkl2QN6fP4rNer80vLRr32sBf7vnKaUr8U5YHI=
k8s.io/apimachinery v0.0.0-20210604074431-a5103dee7e72/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
k8s.io/cli-runtime v0.0.0-20210604080617-23de5b2aa764 h1:C9LZiCB+CNAcTH7u/8kV5cJm6SHqeRRMyYH/75zhusc=
k8s.io/cli-runtime v0.0.0-20210604080617-23de5b2aa764/go.mod h1:hoXwfftgv4YK5FRQFmVjdMKuQjUSNKUMNS9YAObYaPk=
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c h1:FBtlQ+V3SYiId4WWBAZob0vNQvi5PSW5jEQ4EIIXGxY=

4
pkg/cmd/logs/logs.go
View File

@ -58,7 +58,7 @@ var (
kubectl logs nginx --all-containers=true
# Return snapshot logs from all containers in pods defined by label app=nginx
kubectl logs -lapp=nginx --all-containers=true
kubectl logs -l app=nginx --all-containers=true
# Return snapshot of previous terminated ruby container logs from pod web-1
kubectl logs -p -c ruby web-1
@ -67,7 +67,7 @@ var (
kubectl logs -f -c ruby web-1
# Begin streaming the logs from all containers in pods defined by label app=nginx
kubectl logs -f -lapp=nginx --all-containers=true
kubectl logs -f -l app=nginx --all-containers=true
# Display only the most recent 20 lines of output in pod nginx
kubectl logs --tail=20 nginx