summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-22 11:58:12 +0200
committerGitHub <noreply@github.com>2020-05-22 11:58:12 +0200
commit7b2627e7df715c63ab36555a03a65b47efbec0a5 (patch)
tree6c061262946a0f3d13019b26d8d8be0e3d52a287 /pkg
parentbe43536c0a7597075b0bd297993752f9994f12ed (diff)
parent50487832c641028d87c2249ac77efdeb9907ebc3 (diff)
downloadpodman-7b2627e7df715c63ab36555a03a65b47efbec0a5.tar.gz
podman-7b2627e7df715c63ab36555a03a65b47efbec0a5.tar.bz2
podman-7b2627e7df715c63ab36555a03a65b47efbec0a5.zip
Merge pull request #6179 from mheon/add_hairpin
Add HairpinMode to our CNI configs
Diffstat (limited to 'pkg')
-rw-r--r--pkg/network/netconflist.go9
1 files changed, 5 insertions, 4 deletions
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