mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Merge pull request #108251 from danwinship/iptables-tests-cleanup
iptables tests cleanup
This commit is contained in:
commit
267272efe0
@ -1101,7 +1101,7 @@ func (proxier *Proxier) syncProxyRules() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
svcXlbChain := svcInfo.serviceLBChainName
|
svcXlbChain := svcInfo.serviceLBChainName
|
||||||
if svcInfo.NodeLocalExternal() {
|
if hasEndpoints && svcInfo.NodeLocalExternal() {
|
||||||
// Only for services request OnlyLocal traffic
|
// Only for services request OnlyLocal traffic
|
||||||
// create the per-service LB chain, retaining counters if possible.
|
// create the per-service LB chain, retaining counters if possible.
|
||||||
if lbChain, ok := existingNATChains[svcXlbChain]; ok {
|
if lbChain, ok := existingNATChains[svcXlbChain]; ok {
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -51,3 +51,106 @@ func TestReadLinesFromByteBuffer(t *testing.T) {
|
|||||||
expected1 = []string{"", ""}
|
expected1 = []string{"", ""}
|
||||||
testFn(byteArray1, expected1)
|
testFn(byteArray1, expected1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkAllLines(t *testing.T, table Table, save []byte, expectedLines map[Chain]string) {
|
||||||
|
chainLines := GetChainLines(table, save)
|
||||||
|
for chain, lineBytes := range chainLines {
|
||||||
|
line := string(lineBytes)
|
||||||
|
if expected, exists := expectedLines[chain]; exists {
|
||||||
|
if expected != line {
|
||||||
|
t.Errorf("getChainLines expected chain line not present. For chain: %s Expected: %s Got: %s", chain, expected, line)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
t.Errorf("getChainLines expected chain not present: %s", chain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetChainLines(t *testing.T) {
|
||||||
|
iptablesSave := `# Generated by iptables-save v1.4.7 on Wed Oct 29 14:56:01 2014
|
||||||
|
*nat
|
||||||
|
:PREROUTING ACCEPT [2136997:197881818]
|
||||||
|
:POSTROUTING ACCEPT [4284525:258542680]
|
||||||
|
:OUTPUT ACCEPT [5901660:357267963]
|
||||||
|
-A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER
|
||||||
|
COMMIT
|
||||||
|
# Completed on Wed Oct 29 14:56:01 2014`
|
||||||
|
expected := map[Chain]string{
|
||||||
|
ChainPrerouting: ":PREROUTING ACCEPT [2136997:197881818]",
|
||||||
|
ChainPostrouting: ":POSTROUTING ACCEPT [4284525:258542680]",
|
||||||
|
ChainOutput: ":OUTPUT ACCEPT [5901660:357267963]",
|
||||||
|
}
|
||||||
|
checkAllLines(t, TableNAT, []byte(iptablesSave), expected)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetChainLinesMultipleTables(t *testing.T) {
|
||||||
|
iptablesSave := `# Generated by iptables-save v1.4.21 on Fri Aug 7 14:47:37 2015
|
||||||
|
*nat
|
||||||
|
:PREROUTING ACCEPT [2:138]
|
||||||
|
:INPUT ACCEPT [0:0]
|
||||||
|
:OUTPUT ACCEPT [0:0]
|
||||||
|
:POSTROUTING ACCEPT [0:0]
|
||||||
|
:DOCKER - [0:0]
|
||||||
|
:KUBE-NODEPORT-CONTAINER - [0:0]
|
||||||
|
:KUBE-NODEPORT-HOST - [0:0]
|
||||||
|
:KUBE-PORTALS-CONTAINER - [0:0]
|
||||||
|
:KUBE-PORTALS-HOST - [0:0]
|
||||||
|
:KUBE-SVC-1111111111111111 - [0:0]
|
||||||
|
:KUBE-SVC-2222222222222222 - [0:0]
|
||||||
|
:KUBE-SVC-3333333333333333 - [0:0]
|
||||||
|
:KUBE-SVC-4444444444444444 - [0:0]
|
||||||
|
:KUBE-SVC-5555555555555555 - [0:0]
|
||||||
|
:KUBE-SVC-6666666666666666 - [0:0]
|
||||||
|
-A PREROUTING -m comment --comment "handle ClusterIPs; NOTE: this must be before the NodePort rules" -j KUBE-PORTALS-CONTAINER
|
||||||
|
-A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER
|
||||||
|
-A PREROUTING -m addrtype --dst-type LOCAL -m comment --comment "handle service NodePorts; NOTE: this must be the last rule in the chain" -j KUBE-NODEPORT-CONTAINER
|
||||||
|
-A OUTPUT -m comment --comment "handle ClusterIPs; NOTE: this must be before the NodePort rules" -j KUBE-PORTALS-HOST
|
||||||
|
-A OUTPUT ! -d 127.0.0.0/8 -m addrtype --dst-type LOCAL -j DOCKER
|
||||||
|
-A OUTPUT -m addrtype --dst-type LOCAL -m comment --comment "handle service NodePorts; NOTE: this must be the last rule in the chain" -j KUBE-NODEPORT-HOST
|
||||||
|
-A POSTROUTING -s 10.246.1.0/24 ! -o cbr0 -j MASQUERADE
|
||||||
|
-A POSTROUTING -s 10.0.2.15 -d 10.0.2.15 -m comment --comment "handle pod connecting to self" -j MASQUERADE
|
||||||
|
-A KUBE-PORTALS-CONTAINER -d 10.247.0.1 -p tcp -m comment --comment "portal for default/kubernetes:" -m state --state NEW -m tcp --dport 443 -j KUBE-SVC-5555555555555555
|
||||||
|
-A KUBE-PORTALS-CONTAINER -d 10.247.0.10 -p udp -m comment --comment "portal for kube-system/kube-dns:dns" -m state --state NEW -m udp --dport 53 -j KUBE-SVC-6666666666666666
|
||||||
|
-A KUBE-PORTALS-CONTAINER -d 10.247.0.10 -p tcp -m comment --comment "portal for kube-system/kube-dns:dns-tcp" -m state --state NEW -m tcp --dport 53 -j KUBE-SVC-2222222222222222
|
||||||
|
-A KUBE-PORTALS-HOST -d 10.247.0.1 -p tcp -m comment --comment "portal for default/kubernetes:" -m state --state NEW -m tcp --dport 443 -j KUBE-SVC-5555555555555555
|
||||||
|
-A KUBE-PORTALS-HOST -d 10.247.0.10 -p udp -m comment --comment "portal for kube-system/kube-dns:dns" -m state --state NEW -m udp --dport 53 -j KUBE-SVC-6666666666666666
|
||||||
|
-A KUBE-PORTALS-HOST -d 10.247.0.10 -p tcp -m comment --comment "portal for kube-system/kube-dns:dns-tcp" -m state --state NEW -m tcp --dport 53 -j KUBE-SVC-2222222222222222
|
||||||
|
-A KUBE-SVC-1111111111111111 -p udp -m comment --comment "kube-system/kube-dns:dns" -m recent --set --name KUBE-SVC-1111111111111111 --mask 255.255.255.255 --rsource -j DNAT --to-destination 10.246.1.2:53
|
||||||
|
-A KUBE-SVC-2222222222222222 -m comment --comment "kube-system/kube-dns:dns-tcp" -j KUBE-SVC-3333333333333333
|
||||||
|
-A KUBE-SVC-3333333333333333 -p tcp -m comment --comment "kube-system/kube-dns:dns-tcp" -m recent --set --name KUBE-SVC-3333333333333333 --mask 255.255.255.255 --rsource -j DNAT --to-destination 10.246.1.2:53
|
||||||
|
-A KUBE-SVC-4444444444444444 -p tcp -m comment --comment "default/kubernetes:" -m recent --set --name KUBE-SVC-4444444444444444 --mask 255.255.255.255 --rsource -j DNAT --to-destination 10.245.1.2:443
|
||||||
|
-A KUBE-SVC-5555555555555555 -m comment --comment "default/kubernetes:" -j KUBE-SVC-4444444444444444
|
||||||
|
-A KUBE-SVC-6666666666666666 -m comment --comment "kube-system/kube-dns:dns" -j KUBE-SVC-1111111111111111
|
||||||
|
COMMIT
|
||||||
|
# Completed on Fri Aug 7 14:47:37 2015
|
||||||
|
# Generated by iptables-save v1.4.21 on Fri Aug 7 14:47:37 2015
|
||||||
|
*filter
|
||||||
|
:INPUT ACCEPT [17514:83115836]
|
||||||
|
:FORWARD ACCEPT [0:0]
|
||||||
|
:OUTPUT ACCEPT [8909:688225]
|
||||||
|
:DOCKER - [0:0]
|
||||||
|
-A FORWARD -o cbr0 -j DOCKER
|
||||||
|
-A FORWARD -o cbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
|
||||||
|
-A FORWARD -i cbr0 ! -o cbr0 -j ACCEPT
|
||||||
|
-A FORWARD -i cbr0 -o cbr0 -j ACCEPT
|
||||||
|
COMMIT
|
||||||
|
`
|
||||||
|
expected := map[Chain]string{
|
||||||
|
ChainPrerouting: ":PREROUTING ACCEPT [2:138]",
|
||||||
|
Chain("INPUT"): ":INPUT ACCEPT [0:0]",
|
||||||
|
Chain("OUTPUT"): ":OUTPUT ACCEPT [0:0]",
|
||||||
|
ChainPostrouting: ":POSTROUTING ACCEPT [0:0]",
|
||||||
|
Chain("DOCKER"): ":DOCKER - [0:0]",
|
||||||
|
Chain("KUBE-NODEPORT-CONTAINER"): ":KUBE-NODEPORT-CONTAINER - [0:0]",
|
||||||
|
Chain("KUBE-NODEPORT-HOST"): ":KUBE-NODEPORT-HOST - [0:0]",
|
||||||
|
Chain("KUBE-PORTALS-CONTAINER"): ":KUBE-PORTALS-CONTAINER - [0:0]",
|
||||||
|
Chain("KUBE-PORTALS-HOST"): ":KUBE-PORTALS-HOST - [0:0]",
|
||||||
|
Chain("KUBE-SVC-1111111111111111"): ":KUBE-SVC-1111111111111111 - [0:0]",
|
||||||
|
Chain("KUBE-SVC-2222222222222222"): ":KUBE-SVC-2222222222222222 - [0:0]",
|
||||||
|
Chain("KUBE-SVC-3333333333333333"): ":KUBE-SVC-3333333333333333 - [0:0]",
|
||||||
|
Chain("KUBE-SVC-4444444444444444"): ":KUBE-SVC-4444444444444444 - [0:0]",
|
||||||
|
Chain("KUBE-SVC-5555555555555555"): ":KUBE-SVC-5555555555555555 - [0:0]",
|
||||||
|
Chain("KUBE-SVC-6666666666666666"): ":KUBE-SVC-6666666666666666 - [0:0]",
|
||||||
|
}
|
||||||
|
checkAllLines(t, TableNAT, []byte(iptablesSave), expected)
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user