External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 01:47:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #799 from kubernetes-incubator/docker_dns

Browse Source 
Implement "dockerd --dns-xxx" based dns mode
This commit is contained in:
Bogdan Dobrelya
2017-01-09 11:38:02 +01:00
committed by GitHub
parent d18804b0bb a8b5b856d1
commit 091b634ea1
19 changed files with 262 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubernetes/preinstall/tasks/main.yml
View File

@@ -172,6 +172,7 @@
tags: [bootstrap-os, etchosts]
- include: resolvconf.yml
when: dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'
tags: [bootstrap-os, resolvconf]
- name: Check if we are running inside a Azure VM

2
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
View File

@@ -67,7 +67,7 @@
- name: pick dnsmasq cluster IP or default resolver
set_fact:
dnsmasq_server: |-
{%- if skip_dnsmasq|bool and not dns_early|bool -%}
{%- if dns_mode == 'kubedns' and not dns_early|bool -%}
{{ [ skydns_server ] + upstream_dns_servers|default([]) }}
{%- elif dns_early|bool -%}
{{ upstream_dns_servers|default([]) }}