Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cni: fix regression in falling back to DNS owned by dockerd #20189

Merged
merged 1 commit into from
Mar 22, 2024

Commits on Mar 22, 2024

  1. cni: fix regression in falling back to DNS owned by dockerd

    In #20007 we fixed a bug where the DNS configuration set by CNI plugins was not
    threaded through to the task configuration. This resulted in a regression where
    a DNS override set by `dockerd` was not respected for `bridge` mode
    networking. Our existing handling of CNI DNS incorrectly assumed that the DNS
    field would be empty, when in fact it contains a single empty DNS struct.
    
    Handle this case correctly by checking whether the DNS struct we get back from
    CNI has any nameservers, and ignore it if it doesn't. Expand test coverage of
    this case.
    
    Fixes: #20174
    tgross committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    7b02f71 View commit details
    Browse the repository at this point in the history