github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Kubernetes Submit Queue 2017-11-07 14:33:36 -08:00 committed by GitHub
parent 454074d230 a5c334046b
commit 18402f6c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/iptables/iptables.go
View File

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

6
pkg/util/iptables/iptables_test.go
View File

@ -1165,7 +1165,7 @@ func TestRestoreAllWait(t *testing.T) {
} }
commandSet := sets.NewString(fcmd.CombinedOutputLog[2]...) 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]) 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") { if !commandSet.HasAll("iptables-restore", "--counters", "--noflush") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) 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 { if fcmd.CombinedOutputCalls != 3 {