External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-13 17:24:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Introduce dns_mode and resolvconf_mode and implement docker_dns mode

Browse Source 
Also update reset.yml to do more dns/network related cleanup.
This commit is contained in:
Alexander Block
2016-12-21 17:18:11 +01:00
parent aa33613b98
commit 1d2a18b355
18 changed files with 258 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/node/templates/kubelet.j2
View File

@@ -12,9 +12,9 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}"
{% set kubelet_args_base %}--pod-manifest-path={{ kube_manifest_dir }} --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }}{% endset %}
{# DNS settings for kubelet #}
{% if dns_setup|bool and skip_dnsmasq|bool %}
{% if dns_mode == 'kubedns' %}
{% set kubelet_args_cluster_dns %}--cluster_dns={{ skydns_server }}{% endset %}
{% elif dns_setup|bool %}
{% elif dns_mode == 'dnsmasq_kubedns' %}
{% set kubelet_args_cluster_dns %}--cluster_dns={{ dns_server }}{% endset %}
{% else %}
{% set kubelet_args_cluster_dns %}{% endset %}