Skip to content

bridge: support IPAM DNS settings#733

Merged
squeed merged 1 commit intocontainernetworking:mainfrom
Kern--:bridge-ipam-dns
Apr 27, 2022
Merged

bridge: support IPAM DNS settings#733
squeed merged 1 commit intocontainernetworking:mainfrom
Kern--:bridge-ipam-dns

Conversation

@Kern--
Copy link
Copy Markdown

@Kern-- Kern-- commented Apr 21, 2022

Previously, the bridge plugin ignored DNS settings returned
from an IPAM plugin (e.g. the host-local plugin parsing
resolv.conf to configure DNS). With this change, the bridge plugin
uses IPAM DNS settings.

Similarly to #388, this change will use incoming DNS settings if set,
otherwise IPAM plugin returned DNS settings

Fixes #431

Signed-off-by: Kern Walster [email protected]

Previously, the bridge plugin ignored DNS settings returned
from an IPAM plugin (e.g. the host-local plugin parsing
resolv.conf to configure DNS). With this change, the bridge plugin
uses IPAM DNS settings.

Similarly to containernetworking#388, this change will use incoming DNS settings if set,
otherwise IPAM plugin returned DNS settings

Signed-off-by: Kern Walster <[email protected]>
Copy link
Copy Markdown
Member

@mars1024 mars1024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically LGTM

@squeed
Copy link
Copy Markdown
Member

squeed commented Apr 27, 2022

looks great, thanks!

@squeed squeed merged commit 9114aa6 into containernetworking:main Apr 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bridge:get dns config from /etc/cni/net.d default config, not from ipam plugins

3 participants