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

Merge pull request #17578 from Luap99/netavark-dns 

netavark: only use aardvark ip as nameserver
This commit is contained in:
OpenShift Merge Robot 2023-02-22 14:04:12 +01:00 committed by GitHub
parent 44bd6dd1fc 9dc730d9f3
commit 38c91945a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_internal_common.go
View File

@ -2046,7 +2046,11 @@ func (c *Container) generateResolvConf() error {
// If the user provided dns, it trumps all; then dns masq; then resolv.conf // If the user provided dns, it trumps all; then dns masq; then resolv.conf
keepHostServers := false keepHostServers := false
if len(nameservers) == 0 { if len(nameservers) == 0 {
keepHostServers = true // when no network name servers or not netavark use host servers
// for aardvark dns we only want our single server in there
if len(networkNameServers) == 0 || networkBackend != string(types.Netavark) {
keepHostServers = true
}
// first add the nameservers from the networks status // first add the nameservers from the networks status
nameservers = networkNameServers nameservers = networkNameServers
// slirp4netns has a built in DNS forwarder. // slirp4netns has a built in DNS forwarder.

2
test/system/500-networking.bats
View File

@ -663,7 +663,7 @@ EOF
is "$output" "search example.com.*" "correct search domain" is "$output" "search example.com.*" "correct search domain"
local store=$output local store=$output
if is_netavark; then if is_netavark; then
is "$store" ".*nameserver $subnet.1.*" "integrated dns nameserver is set" assert "$store" == "search example.com${nl}nameserver $subnet.1" "only integrated dns nameserver is set"
else else
is "$store" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct" is "$store" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct"
fi fi