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

Add optional manual dns_mode (#2178)

Browse Source
This commit is contained in:
Matthew Mosesohn
2018-01-23 16:28:42 +03:00
committed by Bogdan Dobrelya
parent eb80f9b606
commit bf1411060e
7 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/tasks/set_facts_dns.yml
View File

@@ -7,6 +7,8 @@
{{ [ skydns_server ] }}
{%- elif dns_mode == 'dnsmasq_kubedns' -%}
{{ [ dnsmasq_dns_server ] }}
{%- elif dns_mode == 'manual' -%}
{{ [ manual_dns_server ] }}
{%- endif -%}
- name: set base docker dns facts

2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View File

@@ -50,6 +50,8 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% set kubelet_args_cluster_dns %}--cluster-dns={{ skydns_server }}{% endset %}
{% elif dns_mode == 'dnsmasq_kubedns' %}
{% set kubelet_args_cluster_dns %}--cluster-dns={{ dnsmasq_dns_server }}{% endset %}
{% elif dns_mode == 'manual' %}
{% set kubelet_args_cluster_dns %}--cluster-dns={{ manual_dns_server }}{% endset %}
{% else %}
{% set kubelet_args_cluster_dns %}{% endset %}
{% endif %}

2
roles/kubernetes/node/templates/kubelet.standard.env.j2
View File

@@ -39,6 +39,8 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% set kubelet_args_cluster_dns %}--cluster-dns={{ skydns_server }}{% endset %}
{% elif dns_mode == 'dnsmasq_kubedns' %}
{% set kubelet_args_cluster_dns %}--cluster-dns={{ dnsmasq_dns_server }}{% endset %}
{% elif dns_mode == 'manual' %}
{% set kubelet_args_cluster_dns %}--cluster-dns={{ manual_dns_server }}{% endset %}
{% else %}
{% set kubelet_args_cluster_dns %}{% endset %}
{% endif %}

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

@@ -95,6 +95,8 @@
dnsmasq_server: |-
{%- if dns_mode == 'kubedns' and not dns_early|bool -%}
{{ [ skydns_server ] + upstream_dns_servers|default([]) }}
{%- elif dns_mode == 'manual' and not dns_early|bool -%}
{{ [ manual_dns_server ] + upstream_dns_servers|default([]) }}
{%- elif dns_early|bool -%}
{{ upstream_dns_servers|default([]) }}
{%- else -%}

6
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -33,8 +33,12 @@ retry_stagger: 5
cluster_name: cluster.local
# Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods
ndots: 2
# Can be dnsmasq_kubedns, kubedns or none
# Can be dnsmasq_kubedns, kubedns, manual or none
dns_mode: kubedns
# Should be set to a cluster IP if using a custom cluster DNS
# manual_dns_server: 10.x.x.x
# Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns
# Deploy netchecker app to verify DNS resolve as an HTTP service