Skip most of kubernetes/preinstall role during late DNS config (#3627)

When using resolvconf_mode host_resolvconf, there is an early DNS
config stage where Kubernetes cluster DNS is not injected for host
DNS intially. Later, the cluster DNS is enabled, but we do not
need to run every task from the kubernetes/preinstall role.
This commit is contained in:
Matthew Mosesohn
2018-11-01 18:08:50 +03:00
committed by k8s-ci-robot
parent 2a00c931e4
commit 2ba4e9bda5
3 changed files with 22 additions and 2 deletions

View File

@@ -126,7 +126,7 @@
roles:
- { role: kubespray-defaults}
- { role: dnsmasq, when: "dns_mode == 'dnsmasq_kubedns'", tags: dnsmasq }
- { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf }
- { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_late: true }
environment: "{{proxy_env}}"
- hosts: kube-master