Merge pull request #520 from kubespray/use_dns_name_kubedns

use variable dns_domain instead of cluster_name for kubedns
This commit is contained in:
Smaine Kahlouch 2016-09-27 14:52:30 +02:00 committed by GitHub
commit 6684766c5f

View file

@ -53,7 +53,7 @@ spec:
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns" # command = "/kube-dns"
- --domain={{ cluster_name }}. - --domain={{ dns_domain }}.
- --dns-port=10053 - --dns-port=10053
ports: ports:
- containerPort: 10053 - containerPort: 10053
@ -91,7 +91,7 @@ spec:
# net memory requested by the pod constant. # net memory requested by the pod constant.
memory: 50Mi memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.{{ cluster_name }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ cluster_name }} 127.0.0.1:10053 >/dev/null - -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1:10053 >/dev/null
- -port=8080 - -port=8080
- -quiet - -quiet
ports: ports: