summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-05-11 13:57:19 -0400
committerMatthew Heon <mheon@redhat.com>2020-05-11 14:01:44 -0400
commit15500c028ae973688e2ba32142cb8d7dd3ec1f28 (patch)
tree5c8d0a94e92e754ee5289e6d130f6eb61ace48f5
parent5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d (diff)
downloadpodman-15500c028ae973688e2ba32142cb8d7dd3ec1f28.tar.gz
podman-15500c028ae973688e2ba32142cb8d7dd3ec1f28.tar.bz2
podman-15500c028ae973688e2ba32142cb8d7dd3ec1f28.zip
Add HairpinMode to our CNI configs
This may resolve some issues with routing traffic between containers using the host's IP. Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--cni/87-podman-bridge.conflist1
-rw-r--r--pkg/network/netconflist.go9
2 files changed, 6 insertions, 4 deletions
diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
index 13b09a5b5..ef760a61b 100644
--- a/cni/87-podman-bridge.conflist
+++ b/cni/87-podman-bridge.conflist
@@ -7,6 +7,7 @@
"bridge": "cni-podman0",
"isGateway": true,
"ipMasq": true,
+ "hairpinMode": true,
"ipam": {
"type": "host-local",
"routes": [{ "dst": "0.0.0.0/0" }],
diff --git a/pkg/network/netconflist.go b/pkg/network/netconflist.go
index 34ff00024..4271d3f54 100644
--- a/pkg/network/netconflist.go
+++ b/pkg/network/netconflist.go
@@ -21,10 +21,11 @@ func NewNcList(name, version string) NcList {
// NewHostLocalBridge creates a new LocalBridge for host-local
func NewHostLocalBridge(name string, isGateWay, isDefaultGW, ipMasq bool, ipamConf IPAMHostLocalConf) *HostLocalBridge {
hostLocalBridge := HostLocalBridge{
- PluginType: "bridge",
- BrName: name,
- IPMasq: ipMasq,
- IPAM: ipamConf,
+ PluginType: "bridge",
+ BrName: name,
+ IPMasq: ipMasq,
+ HairpinMode: true,
+ IPAM: ipamConf,
}
if isGateWay {
hostLocalBridge.IsGW = true