Make CaaS DNS domains configurable

Change-Id: I1c01f840da8c8625613c589cb7f140675cb5af6a

diff --git a/ansible/roles/kubedns/templates/kubedns-deployment.yml b/ansible/roles/kubedns/templates/kubedns-deployment.yml
index e95c78f..d60e692 100644 (file)
--- a/ansible/roles/kubedns/templates/kubedns-deployment.yml
+++ b/ansible/roles/kubedns/templates/kubedns-deployment.yml
@@ -91,7 +91,7 @@ spec:
         command:
         - /usr/bin/kube-dns
         args:
         command:
         - /usr/bin/kube-dns
         args:

-        - --domain=nokia.net.
+        - --domain={{ caas.dns_domain }}.

         - --dns-port=10053
         - --config-dir=/etc/dns_config
         - --v=2
         - --dns-port=10053
         - --config-dir=/etc/dns_config
         - --v=2


@@ -145,7 +145,7 @@ spec:
         - --bind-interfaces
         - --dns-forward-max=1000
         - --cache-size=10000
         - --bind-interfaces
         - --dns-forward-max=1000
         - --cache-size=10000

-        - --server=/nokia.net/127.0.0.1#10053
+        - --server=/{{ caas.dns_domain }}/127.0.0.1#10053

         # see: https://github.com/kubernetes/kubernetes/issues/29055 for details
         resources:
           requests:
         # see: https://github.com/kubernetes/kubernetes/issues/29055 for details
         resources:
           requests: