Merge pull request #65534 from honkiko/remove-dup-masq-rule

Automatic merge from submit-queue (batch tested with PRs 65188, 65541, 65534). 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>. ipvs: remove duplicated masq rules Duplicated masq rules are created by current implementation: ``` -A KUBE-NODE-PORT -m comment --comment "mark MASQ for externaltrafficpolicy=cluster" -j KUBE-MARK-MASQ -A KUBE-NODE-PORT -j KUBE-MARK-MASQ ``` The last one is always there. So the one inside if statement could just be removed. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #65534 from honkiko/remove-dup-masq-rule
f1f16614 · Kubernetes Submit Queue · GitHub · f119fa14 · 0e6f0736 · f1f16614
Unverified Commit f1f16614 authored Jun 29, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

proxier.go pkg/proxy/ipvs/proxier.go +0 -7

No files found.
--- a/pkg/proxy/ipvs/proxier.go
+++ b/pkg/proxy/ipvs/proxier.go
@@ -1283,13 +1283,6 @@ func (proxier *Proxier) writeIptablesRules() {
 			)
 			writeLine(proxier.natRules, append(args, "-j", "ACCEPT")...)
 		}
-		// mark masq for others
-		args = append(args[:0],
-			"-A", string(KubeNodePortChain),
-			"-m", "comment", "--comment",
-			fmt.Sprintf(`"mark MASQ for externaltrafficpolicy=cluster"`),
-		)
-		writeLine(proxier.natRules, append(args, "-j", string(KubeMarkMasqChain))...)
 	}

 	// mark masq for KUBE-NODE-PORT