Merge pull request #70577 from WanLinghao/kubectl_logs_fix

fix a bug that --tail option does not take effects in 'kubectl logs --selector xx=xx --tail 3'

Merge pull request #70577 from WanLinghao/kubectl_logs_fix
5656ac75 · k8s-ci-robot · GitHub · be85dc07 · ea7065d4 · 5656ac75
Unverified Commit 5656ac75 authored Nov 05, 2018 by k8s-ci-robot Committed by GitHub Nov 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

logs.go pkg/kubectl/cmd/logs/logs.go +1 -1

No files found.
--- a/pkg/kubectl/cmd/logs/logs.go
+++ b/pkg/kubectl/cmd/logs/logs.go
@@ -181,7 +181,7 @@ func (o *LogsOptions) ToLogOptions() (*corev1.PodLogOptions, error) {
 		logOptions.SinceSeconds = &sec
 	}

-	if len(o.Selector) > 0 && o.Tail != -1 {
+	if len(o.Selector) > 0 && o.Tail == -1 {
 		logOptions.TailLines = &selectorTail
 	} else if o.Tail != -1 {
 		logOptions.TailLines = &o.Tail