Merge pull request #28572 from atombender/master

Automatic merge from submit-queue Fixes bad heuristic when calling "tc show" to check interface `tc` sometimes returns stuff that has more than 12 words in its response. The heuristic is bad, but this at least fixes the case when `tc` is returning too much. Fixes #28571.

Merge pull request #28572 from atombender/master
66522389 · k8s-merge-robot · GitHub · 0f20ab63 · e681002d · 66522389
Commit 66522389 authored Jul 08, 2016 by k8s-merge-robot Committed by GitHub Jul 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

linux.go pkg/util/bandwidth/linux.go +1 -1

No files found.
--- a/pkg/util/bandwidth/linux.go
+++ b/pkg/util/bandwidth/linux.go
@@ -255,7 +255,7 @@ func (t *tcShaper) ReconcileInterface() error {
 		return t.initializeInterface()
 	}
 	fields := strings.Split(output, " ")
-	if len(fields) != 12 || fields[1] != "htb" || fields[2] != "1:" {
+	if len(fields) < 12 || fields[1] != "htb" || fields[2] != "1:" {
 		if err := t.deleteInterface(fields[2]); err != nil {
 			return err
 		}