From 06b3406cef94b31857311eaab052d997c3b72ae9 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Thu, 23 Jul 2015 10:25:06 +0200 Subject: [PATCH] Added possibility to overwrite ENABLE_CLUSTER_DNS with env var It's for autoscaling tests purposes and making the config consistent with other flags like ENABLE_NODE_LOGGING --- cluster/addons/dns/README.md | 2 +- cluster/aws/config-default.sh | 2 +- cluster/aws/config-test.sh | 2 +- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- cluster/libvirt-coreos/config-default.sh | 2 +- cluster/rackspace/config-default.sh | 2 +- cluster/ubuntu/config-default.sh | 2 +- cluster/vagrant/config-default.sh | 2 +- cluster/vsphere/config-default.sh | 2 +- docs/getting-started-guides/ubuntu.md | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cluster/addons/dns/README.md b/cluster/addons/dns/README.md index e4987169ed1..68d540d6e4f 100644 --- a/cluster/addons/dns/README.md +++ b/cluster/addons/dns/README.md @@ -75,7 +75,7 @@ cluster turn-up to create the SkyDNS pods and configure the kubelets. For example, see `cluster/gce/config-default.sh`. ```sh -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 diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 59eaa57d76f..6da9ae8fd9a 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -72,7 +72,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 diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index d8963e4f828..b4c8c29c556 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -68,7 +68,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 diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index c6f31c93a5b..da8c32c812b 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -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 diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index fae9b7fa63c..33c46634c6e 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -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 diff --git a/cluster/libvirt-coreos/config-default.sh b/cluster/libvirt-coreos/config-default.sh index d6e407f376f..2318b6fdfe1 100644 --- a/cluster/libvirt-coreos/config-default.sh +++ b/cluster/libvirt-coreos/config-default.sh @@ -53,7 +53,7 @@ ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch # Optional: Install cluster DNS. -ENABLE_CLUSTER_DNS=true +ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="10.11.0.254" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index 44f897dffb9..ebee43c794e 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -53,7 +53,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # 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 diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 66870bafd44..3b62072db4c 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -55,7 +55,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}" DOCKER_OPTS=${DOCKER_OPTS:-""} # Optional: Install cluster DNS. -ENABLE_CLUSTER_DNS=true +ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" # DNS_SERVER_IP must be a IP in SERVICE_CLUSTER_IP_RANGE DNS_SERVER_IP=${DNS_SERVER_IP:-"192.168.3.10"} DNS_DOMAIN=${DNS_DOMAIN:-"cluster.local"} diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index afe34e824e1..f17e87c68bc 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -74,7 +74,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" EXTRA_DOCKER_OPTS="-b=cbr0 --insecure-registry 10.0.0.0/8" # Optional: Install cluster DNS. -ENABLE_CLUSTER_DNS=true +ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="10.247.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index 6e7229a6f34..be2b9a5a430 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -48,7 +48,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # Optional: Install cluster DNS. -ENABLE_CLUSTER_DNS=true +ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="10.244.240.240" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md index 1b6e3c371d7..a13a8eb6918 100644 --- a/docs/getting-started-guides/ubuntu.md +++ b/docs/getting-started-guides/ubuntu.md @@ -158,7 +158,7 @@ After the previous parts, you will have a working k8s cluster, this part will te The configuration of dns is configured in cluster/ubuntu/config-default.sh. ```sh -ENABLE_CLUSTER_DNS=true +ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="192.168.3.10"