From 0d5bcd3e2009c36b47a736a0f31fb0c277241e9a Mon Sep 17 00:00:00 2001
From: Marijn van der Giesen <55738566+mvandergiesen@users.noreply.github.com>
Date: Thu, 5 Jan 2023 15:57:58 +0100
Subject: [PATCH] feat(coredns): Forward extra domains to coredns kubernetes
plugin (#9635)
---
docs/dns-stack.md | 4 ++++
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml | 2 ++
roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/docs/dns-stack.md b/docs/dns-stack.md
index 60eadc4b6..f1675127a 100644
--- a/docs/dns-stack.md
+++ b/docs/dns-stack.md
@@ -60,6 +60,10 @@ By default, no other option than the ones hardcoded (see `roles/kubernetes-apps/
Custom options to be added to the kubernetes coredns plugin.
+### coredns_kubernetes_extra_domains
+
+Extra domains to be forwarded to the kubernetes coredns plugin.
+
### coredns_external_zones
Array of optional external zones to coredns forward queries to. It's injected into
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
index 189157d59..85d402929 100644
--- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
@@ -211,6 +211,8 @@ enable_coredns_k8s_endpoint_pod_names: false
# Apply extra options to coredns kubernetes plugin
# coredns_kubernetes_extra_opts:
# - 'fallthrough example.local'
+# Forward extra domains to the coredns kubernetes plugin
+# coredns_kubernetes_extra_domains: ''
# Can be docker_dns, host_resolvconf or none
resolvconf_mode: host_resolvconf
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
index d92d78849..36de0d996 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
@@ -36,7 +36,7 @@ data:
lameduck 5s
}
ready
- kubernetes {{ dns_domain }} {% if enable_coredns_reverse_dns_lookups %}in-addr.arpa ip6.arpa {% endif %}{
+ kubernetes {{ dns_domain }} {% if coredns_kubernetes_extra_domains is defined %}{{ coredns_kubernetes_extra_domains }} {% endif %}{% if enable_coredns_reverse_dns_lookups %}in-addr.arpa ip6.arpa {% endif %}{
pods insecure
{% if enable_coredns_k8s_endpoint_pod_names %}
endpoint_pod_names
--
GitLab