Merge pull request #55248 from knobunc/fix/increase-iptables-wait

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add the iptables wait flag change to more places There were a few places that the last PR (https://github.com/kubernetes/kubernetes/pull/54763) missed because the flags that PR covered were of the form `-w2`. Some of the code had `--wait=2`. This changes that code to use the same global variable for the wait setting so that everything is consistent.

Merge pull request #55248 from knobunc/fix/increase-iptables-wait
18402f6c · Kubernetes Submit Queue · GitHub · 454074d2 · a5c33404 · 18402f6c
Unverified Commit 18402f6c authored Nov 07, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

iptables.go pkg/util/iptables/iptables.go +1 -1

iptables_test.go pkg/util/iptables/iptables_test.go +3 -3

No files found.
--- a/pkg/util/iptables/iptables.go
+++ b/pkg/util/iptables/iptables.go
@@ -592,7 +592,7 @@ func getIPTablesRestoreWaitFlag(exec utilexec.Interface, protocol Protocol) []st
 		return nil
 	}
-	return []string{"--wait=2"}
+	return []string{WaitSecondsString}
 }
 // getIPTablesRestoreVersionString runs "iptables-restore --version" to get the version string

--- a/pkg/util/iptables/iptables_test.go
+++ b/pkg/util/iptables/iptables_test.go
@@ -1165,7 +1165,7 @@ func TestRestoreAllWait(t *testing.T) {
 	}
 	commandSet := sets.NewString(fcmd.CombinedOutputLog[2]...)
-	if !commandSet.HasAll("iptables-restore", "--wait=2", "--counters", "--noflush") {
+	if !commandSet.HasAll("iptables-restore", WaitSecondsString, "--counters", "--noflush") {
 		t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
 	}
@@ -1214,8 +1214,8 @@ func TestRestoreAllWaitOldIptablesRestore(t *testing.T) {
 	if !commandSet.HasAll("iptables-restore", "--counters", "--noflush") {
 		t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
 	}
-	if commandSet.HasAny("--wait=2") {
+	if commandSet.HasAny(WaitSecondsString) {
-		t.Errorf("wrong CombinedOutput() log (unexpected --wait=2 option), got %s", fcmd.CombinedOutputLog[2])
+		t.Errorf("wrong CombinedOutput() log (unexpected %s option), got %s", WaitSecondsString, fcmd.CombinedOutputLog[2])
 	}
 	if fcmd.CombinedOutputCalls != 3 {