Merge pull request kubernetes#85527 from aojea/fix#85414

k8s-ci-robot · web-flow · commit 459b1d76bf0d · 2019-11-23T13:19:49.000-08:00
Revert "kube-proxy: check KUBE-MARK-DROP"
diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go
@@ -847,7 +847,7 @@ func (proxier *Proxier) syncProxyRules() {
 			writeLine(proxier.filterChains, utiliptables.MakeChainLine(chainName))
 		}
 	}
-	for _, chainName := range []utiliptables.Chain{kubeServicesChain, kubeNodePortsChain, kubePostroutingChain, KubeMarkMasqChain, KubeMarkDropChain} {
+	for _, chainName := range []utiliptables.Chain{kubeServicesChain, kubeNodePortsChain, kubePostroutingChain, KubeMarkMasqChain} {
 		if chain, ok := existingNATChains[chainName]; ok {
 			writeBytesLine(proxier.natChains, chain)
 		} else {
diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go
@@ -2350,7 +2350,6 @@ COMMIT
 :KUBE-NODEPORTS - [0:0]
 :KUBE-POSTROUTING - [0:0]
 :KUBE-MARK-MASQ - [0:0]
-:KUBE-MARK-DROP - [0:0]
 :KUBE-SVC-AHZNAGK3SCETOS2T - [0:0]
 :KUBE-SEP-PXD6POUVGD2I37UY - [0:0]
 :KUBE-SEP-SOKZUIT7SCEVIP33 - [0:0]

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ func (proxier *Proxier) syncProxyRules() {`
`847`	`847`	`writeLine(proxier.filterChains, utiliptables.MakeChainLine(chainName))`
`848`	`848`	`}`
`849`	`849`	`}`
`850`		`- for _, chainName := range []utiliptables.Chain{kubeServicesChain, kubeNodePortsChain, kubePostroutingChain, KubeMarkMasqChain, KubeMarkDropChain} {`
	`850`	`+ for _, chainName := range []utiliptables.Chain{kubeServicesChain, kubeNodePortsChain, kubePostroutingChain, KubeMarkMasqChain} {`
`851`	`851`	`if chain, ok := existingNATChains[chainName]; ok {`
`852`	`852`	`writeBytesLine(proxier.natChains, chain)`
`853`	`853`	`} else {`