github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11740 from piosz/config

Browse Source 
Added possibility to overwrite ENABLE_CLUSTER_DNS with env var
This commit is contained in:
Vish Kannan
2015-07-23 13:25:35 -07:00
parent 94bed5a426 06b3406cef
commit dc59c99d1a
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@@ -69,7 +69,7 @@ if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then
fi
# Optional: Install cluster DNS.
ENABLE_CLUSTER_DNS=true
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
DNS_SERVER_IP="10.0.0.10"
DNS_DOMAIN="cluster.local"
DNS_REPLICAS=1

2
cluster/gce/config-test.sh
View File

@@ -67,7 +67,7 @@ if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then
fi
# Optional: Install cluster DNS.
ENABLE_CLUSTER_DNS=true
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
DNS_SERVER_IP="10.0.0.10"
DNS_DOMAIN="cluster.local"
DNS_REPLICAS=1