• Kubernetes Submit Queue's avatar
    Merge pull request #29378 from vefimova/docker_resolv · d5ff6946
    Kubernetes Submit Queue authored
    Automatic merge from submit-queue
    
    Re-writing of the resolv.conf file generated by docker
    
    Fixes #17406 
    
    Docker 1.12 will contain feature "The option --dns and --net=host should not be mutually exclusive" (docker/docker#22408)
    This patch adds optional support for this ability in kubelet (for now in case of "hostNetwork: true" set all dns settings are ignored if any).
    To enable feature use newly added kubelet flag: --allow-dns-for-hostnet=true
    d5ff6946
Name
Last commit
Last update
..
src/k8s.io Loading commit data...
README.md Loading commit data...
copy.sh Loading commit data...
godeps-json-updater.go Loading commit data...
prime-apimachinery.sh Loading commit data...