Skip to content

Commit

Permalink
add k8s_external plugin to CoreDNS configuration (kubernetes-sigs#4704)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbarcelo authored and k8s-ci-robot committed Jul 16, 2019
1 parent d9dedc2 commit 99c5f7e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docs/vars.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ following default cluster parameters:
bits in kube_pods_subnet dictates how many kube-nodes can be in cluster.
* *skydns_server* - Cluster IP for DNS (default is 10.233.0.3)
* *skydns_server_secondary* - Secondary Cluster IP for CoreDNS used with coredns_dual deployment (default is 10.233.0.4)
* *enable_coredns_k8s_external* - If enabled, it configures the [k8s_external plugin](https://coredns.io/plugins/k8s_external/)
on the CoreDNS service.
* *coredns_k8s_external_zone* - Zone that will be used when CoreDNS k8s_external plugin is enabled
(default is k8s_external.local)
* *cloud_provider* - Enable extra Kubelet option if operating inside GCE or
OpenStack (default is unset)
* *kube_hostpath_dynamic_provisioner* - Required for use of PetSets type in
Expand Down
3 changes: 3 additions & 0 deletions inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ dns_mode: coredns
enable_nodelocaldns: true
nodelocaldns_ip: 169.254.25.10
nodelocaldns_health_port: 9254
# Enable k8s_external plugin for CoreDNS
enable_coredns_k8s_external: false
coredns_k8s_external_zone: k8s_external.local

# Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns
Expand Down
3 changes: 3 additions & 0 deletions roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ data:
forward . /etc/resolv.conf {
prefer_udp
}
{% endif %}
{% if enable_coredns_k8s_external %}
k8s_external {{ coredns_k8s_external_zone }}
{% endif %}
cache 30
loop
Expand Down
2 changes: 2 additions & 0 deletions roles/kubespray-defaults/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ kube_dns_servers:

dns_servers: "{{kube_dns_servers[dns_mode]}}"

enable_coredns_k8s_external: false
coredns_k8s_external_zone: k8s_external.local

# Kubernetes configuration dirs and system namespace.
# Those are where all the additional config stuff goes
Expand Down

0 comments on commit 99c5f7e

Please sign in to comment.