diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 22:30:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 22:30:45 +0000 |
| commit | 915ae6d9bfa39515d7280f29b5d7d072753cc788 (patch) | |
| tree | bc3b2295bf6f6e0f45230d5d5d37dc1077b47ddb /libpod | |
| parent | e75dc3d536a9f8f457dfc35482ff61efc80cbb09 (diff) | |
| parent | edf0e918e32f4f109329881310b798f3b2c7defb (diff) | |
| download | podman-915ae6d9bfa39515d7280f29b5d7d072753cc788.tar.gz podman-915ae6d9bfa39515d7280f29b5d7d072753cc788.tar.bz2 podman-915ae6d9bfa39515d7280f29b5d7d072753cc788.zip | |
Merge pull request #8756 from Luap99/fix-8748
Always add the default gateway to the cni config file
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/network/netconflist.go | 4 | ||||
| -rw-r--r-- | libpod/network/netconflist_test.go | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go index d61b96ecb..af25ee59c 100644 --- a/libpod/network/netconflist.go +++ b/libpod/network/netconflist.go @@ -95,6 +95,10 @@ func NewIPAMLocalHostRange(subnet *net.IPNet, ipRange *net.IPNet, gw net.IP) ([] } if gw != nil { hostRange.Gateway = gw.String() + } else { + // Add first ip in subnet as gateway. It is not required + // by cni but should be included because of network inspect. + hostRange.Gateway = CalcGatewayIP(subnet).String() } ranges = append(ranges, hostRange) return ranges, nil diff --git a/libpod/network/netconflist_test.go b/libpod/network/netconflist_test.go index 6bf1a9777..5ff733f0f 100644 --- a/libpod/network/netconflist_test.go +++ b/libpod/network/netconflist_test.go @@ -51,7 +51,8 @@ func TestNewIPAMLocalHostRange(t *testing.T) { subnet: &net.IPNet{IP: net.IPv4(192, 168, 0, 0), Mask: net.IPv4Mask(255, 255, 255, 0)}, want: []IPAMLocalHostRangeConf{ { - Subnet: "192.168.0.0/24", + Subnet: "192.168.0.0/24", + Gateway: "192.168.0.1", }, }, }, @@ -74,7 +75,8 @@ func TestNewIPAMLocalHostRange(t *testing.T) { subnet: &net.IPNet{IP: net.ParseIP("2001:DB8::"), Mask: net.IPMask(net.ParseIP("ffff:ffff:ffff::"))}, want: []IPAMLocalHostRangeConf{ { - Subnet: "2001:db8::/48", + Subnet: "2001:db8::/48", + Gateway: "2001:db8::1", }, }, }, |