github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70577 from WanLinghao/kubectl_logs_fix

Browse Source 
fix a bug that --tail option does not take effects in 'kubectl logs --selector xx=xx --tail 3'
This commit is contained in:
k8s-ci-robot 2018-11-05 16:32:53 -08:00 committed by GitHub
commit 5656ac754d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/logs/logs.go
View File

@ -181,7 +181,7 @@ func (o *LogsOptions) ToLogOptions() (*corev1.PodLogOptions, error) {
logOptions.SinceSeconds = &sec logOptions.SinceSeconds = &sec
} }
if len(o.Selector) > 0 && o.Tail != -1 { if len(o.Selector) > 0 && o.Tail == -1 {
logOptions.TailLines = &selectorTail logOptions.TailLines = &selectorTail
} else if o.Tail != -1 { } else if o.Tail != -1 {
logOptions.TailLines = &o.Tail logOptions.TailLines = &o.Tail