Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit e849c68

Browse files
committed
Fix array append
Signed-off-by: Keith Mattix II <[email protected]>
1 parent c334d83 commit e849c68

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

pkg/injector/init_container_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ EOF
138138
-A OSM_PROXY_INBOUND -p tcp -j OSM_PROXY_IN_REDIRECT
139139
-A OSM_PROXY_OUT_REDIRECT -p tcp -j REDIRECT --to-port 15001
140140
-A OSM_PROXY_OUT_REDIRECT -p tcp --dport 15000 -j ACCEPT
141-
-A OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner 1500 -j DNAT --to-destination $POD_IP
142141
-A OUTPUT -p tcp -j OSM_PROXY_OUTBOUND
143142
-A OSM_PROXY_OUTBOUND -o lo ! -d 127.0.0.1/32 -m owner --uid-owner 1500 -j OSM_PROXY_IN_REDIRECT
144143
-A OSM_PROXY_OUTBOUND -o lo -m owner ! --uid-owner 1500 -j RETURN
145144
-A OSM_PROXY_OUTBOUND -m owner --uid-owner 1500 -j RETURN
146145
-A OSM_PROXY_OUTBOUND -d 127.0.0.1/32 -j RETURN
146+
-I OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner 1500 -j DNAT --to-destination $POD_IP
147147
-A OSM_PROXY_OUTBOUND -j OSM_PROXY_OUT_REDIRECT
148148
COMMIT
149149
EOF

pkg/injector/iptables.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func generateIptablesCommands(proxyMode configv1alpha2.LocalProxyMode, outboundI
101101
// For envoy -> local service container proxying, send traffic to pod IP instead of localhost
102102
// *Note: it is important to use the insert option '-I' instead of the append option '-A' to ensure the
103103
// DNAT to the pod ip for envoy -> localhost traffic happens before the rule that redirects traffic to the proxy
104-
iptablesOutboundStaticRules = append(cmds, fmt.Sprintf("-I OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner %d -j DNAT --to-destination $POD_IP", constants.EnvoyUID))
104+
cmds = append(cmds, fmt.Sprintf("-I OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner %d -j DNAT --to-destination $POD_IP", constants.EnvoyUID))
105105
}
106106

107107
// Ignore outbound traffic in specified interfaces

pkg/injector/iptables_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ EOF
112112
-A OSM_PROXY_INBOUND -p tcp -j OSM_PROXY_IN_REDIRECT
113113
-A OSM_PROXY_OUT_REDIRECT -p tcp -j REDIRECT --to-port 15001
114114
-A OSM_PROXY_OUT_REDIRECT -p tcp --dport 15000 -j ACCEPT
115-
-A OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner 1500 -j DNAT --to-destination $POD_IP
116115
-A OUTPUT -p tcp -j OSM_PROXY_OUTBOUND
117116
-A OSM_PROXY_OUTBOUND -o lo ! -d 127.0.0.1/32 -m owner --uid-owner 1500 -j OSM_PROXY_IN_REDIRECT
118117
-A OSM_PROXY_OUTBOUND -o lo -m owner ! --uid-owner 1500 -j RETURN
119118
-A OSM_PROXY_OUTBOUND -m owner --uid-owner 1500 -j RETURN
120119
-A OSM_PROXY_OUTBOUND -d 127.0.0.1/32 -j RETURN
120+
-I OUTPUT -p tcp -o lo -d 127.0.0.1/32 -m owner --uid-owner 1500 -j DNAT --to-destination $POD_IP
121121
-A OSM_PROXY_OUTBOUND -j OSM_PROXY_OUT_REDIRECT
122122
COMMIT
123123
EOF

0 commit comments

Comments
 (0)