Merge pull request #10552 from shauns/patch-1

Respect DNS_DOMAIN setting in AWS+CoreOS
This commit is contained in:
Yu-Ju Hong 2015-07-06 09:36:54 -07:00
commit acf848a597

View File

@ -70,7 +70,7 @@ coreos:
--allow_privileged=False \ --allow_privileged=False \
--v=2 \ --v=2 \
--cluster_dns=10.0.0.10 \ --cluster_dns=10.0.0.10 \
--cluster_domain=kubernetes.local \ --cluster_domain=${DNS_DOMAIN} \
--logtostderr=true \ --logtostderr=true \
--hostname-override=${HOSTNAME_OVERRIDE} \ --hostname-override=${HOSTNAME_OVERRIDE} \
--container-runtime=${KUBERNETES_CONTAINER_RUNTIME} --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}