diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 03:15:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 03:15:51 -0700 |
| commit | 811c5dea8dc5b7fea5b70ca027c34221bde32b9e (patch) | |
| tree | 5c8d0a94e92e754ee5289e6d130f6eb61ace48f5 | |
| parent | 5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d (diff) | |
| parent | 15500c028ae973688e2ba32142cb8d7dd3ec1f28 (diff) | |
| download | podman-811c5dea8dc5b7fea5b70ca027c34221bde32b9e.tar.gz podman-811c5dea8dc5b7fea5b70ca027c34221bde32b9e.tar.bz2 podman-811c5dea8dc5b7fea5b70ca027c34221bde32b9e.zip | |
Merge pull request #6180 from mheon/add_hairpin_19
Add HairpinMode to our CNI configs [v1.9]
| -rw-r--r-- | cni/87-podman-bridge.conflist | 1 | ||||
| -rw-r--r-- | pkg/network/netconflist.go | 9 |
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 |