New variable kubernetes_cluster_domain
Use cluster_domain/domain variable consistently across all templated files.
All kubeconfig fields contain cluster domain for uniqueness.
Using kubernetes_cluster_domain param now to allow physical servers
to have a different domain from kubernetes cluster if necessary, but
the default keeps them the same.
Change-Id: Ic1e571dc92166b8b603214367f10382fb0ff04b7
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index 5e72de2..12f782f 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -2,8 +2,11 @@
- service.kubernetes.logging
- service.kubernetes.monitoring
parameters:
+ _param:
+ kubernetes_cluster_domain: ${_param:cluster_domain}
kubernetes:
common:
+ cluster_domain: ${_param:kubernetes_cluster_domain}
network:
engine: none
mtu: 1500
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index e969046..f755401 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -40,7 +40,7 @@
replicas: 1
autoscaler:
enabled: true
- domain: cluster.local
+ domain: ${_param:kubernetes_cluster_domain}
server: 10.254.0.10
dnsmasq:
cache-size: 1000
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 524737e..00dff34 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -35,7 +35,7 @@
replicas: 1
autoscaler:
enabled: true
- domain: cluster.local
+ domain: ${_param:kubernetes_cluster_domain}
server: 10.254.0.10
dnsmasq:
cache-size: 1000
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 1905d3a..41c8ffb 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -23,7 +23,7 @@
# - host: ${_param:cluster_node03_address}
address: ${_param:cluster_local_address}
cluster_dns: 10.254.0.10
- cluster_domain: cluster.local
+ cluster_domain: ${_param:kubernetes_cluster_domain}
kubelet:
config: /etc/kubernetes/manifests
allow_privileged: True
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index 62e5911..e5826c3 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -20,7 +20,7 @@
address: 0.0.0.0
cluster_dns: 10.254.0.10
allow_privileged: True
- cluster_domain: cluster.local
+ cluster_domain: ${param:kubernetes_cluster_domain}
kubelet:
config: /etc/kubernetes/manifests
allow_privileged: True