Make CaaS DNS domains configurable

Change-Id: Ib6ec6b77f75ae0793376a3cf20f0b7735434c1ab

diff --git a/ansible/roles/kube_master/meta/main.yml b/ansible/roles/kube_master/meta/main.yml
index df11978..21619b8 100644 (file)
--- a/ansible/roles/kube_master/meta/main.yml
+++ b/ansible/roles/kube_master/meta/main.yml
@@ -88,7 +88,7 @@ dependencies:
     cert_path: /etc/kubernetes/ssl
     alt_names:
       dns:
-        - custom-metrics-apiserver.kube-system.svc.nokia.net
+        - "custom-metrics-apiserver.kube-system.svc.{{ caas.dns_domain }}"
     add_users:
       - kube
     become: true

diff --git a/ansible/roles/kubelet/templates/master-config.yaml.j2 b/ansible/roles/kubelet/templates/master-config.yaml.j2
index 9edf406..453bb02 100644 (file)
--- a/ansible/roles/kubelet/templates/master-config.yaml.j2
+++ b/ansible/roles/kubelet/templates/master-config.yaml.j2
@@ -31,7 +31,7 @@ cgroupRoot: "/"
 cgroupDriver: cgroupfs
 clusterDNS:
 - {{ caas.dns_svc_ip }}
-clusterDomain: nokia.net
+clusterDomain: {{ caas.dns_domain }}
 staticPodPath: "/etc/kubernetes/manifests"
 rotateCertificates: true
 runtimeRequestTimeout: 5m0s

diff --git a/ansible/roles/kubelet/templates/worker-config.yaml.j2 b/ansible/roles/kubelet/templates/worker-config.yaml.j2
index 613d8cc..0d86736 100644 (file)
--- a/ansible/roles/kubelet/templates/worker-config.yaml.j2
+++ b/ansible/roles/kubelet/templates/worker-config.yaml.j2
@@ -31,7 +31,7 @@ cgroupRoot: "/"
 cgroupDriver: cgroupfs
 clusterDNS:
 - {{ caas.dns_svc_ip }}
-clusterDomain: nokia.net
+clusterDomain: {{ caas.dns_domain }}
 staticPodPath: "/etc/kubernetes/manifests"
 rotateCertificates: true
 runtimeRequestTimeout: 5m0s