containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1208 from Luap99/macvlan-dns 

libnetwork/netavark: disable dns for macvlan
This commit is contained in:
OpenShift Merge Robot 2022-10-25 10:40:43 -04:00 committed by GitHub
parent 903e2e5fe9 13a70914f3
commit 2533870d24
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/libnetwork/netavark/config.go
View File

@ -170,6 +170,11 @@ func createMacvlan(network *types.Network) error {
} }
} }
// always turn dns off with macvlan, it is not implemented in netavark
// and makes little sense to support with macvlan
// see https://github.com/containers/netavark/pull/467
network.DNSEnabled = false
// we already validated the drivers before so we just have to set the default here // we already validated the drivers before so we just have to set the default here
switch network.IPAMOptions[types.Driver] { switch network.IPAMOptions[types.Driver] {
case "": case "":

2
common/libnetwork/types/network.go
View File

@ -54,7 +54,7 @@ type Network struct {
// to public or other Networks. // to public or other Networks.
Internal bool `json:"internal"` Internal bool `json:"internal"`
// DNSEnabled is whether name resolution is active for container on // DNSEnabled is whether name resolution is active for container on
// this Network. // this Network. Only supported with the bridge driver.
DNSEnabled bool `json:"dns_enabled"` DNSEnabled bool `json:"dns_enabled"`
// Labels is a set of key-value labels that have been applied to the // Labels is a set of key-value labels that have been applied to the
// Network. // Network.