diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index e8ed83338e..8fe8e474ed 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -50,6 +50,9 @@ AWS_S3_REGION=${AWS_S3_REGION:-us-east-1} # Which docker storage mechanism to use. DOCKER_STORAGE=${DOCKER_STORAGE:-aufs} +# Extra docker options for nodes. +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" + INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} @@ -99,7 +102,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then - EXTRA_DOCKER_OPTS="--insecure-registry ${NON_MASQUERADE_CIDR}" + EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry ${NON_MASQUERADE_CIDR}" fi # Optional: Install cluster DNS. diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index a105b7d8a2..4da6482858 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -48,6 +48,9 @@ AWS_S3_REGION=${AWS_S3_REGION:-us-east-1} # Which docker storage mechanism to use. DOCKER_STORAGE=${DOCKER_STORAGE:-aufs} +# Extra docker options for nodes. +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" + INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} @@ -95,7 +98,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then - EXTRA_DOCKER_OPTS="--insecure-registry ${NON_MASQUERADE_CIDR}" + EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry ${NON_MASQUERADE_CIDR}" fi # Optional: Install cluster DNS. diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 1477784aa5..e540be95ee 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -47,6 +47,9 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}" NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" +# Extra docker options for nodes. +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" + # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL="${POLL_SLEEP_INTERVAL:-3}" SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/16}" # formerly PORTAL_NET @@ -74,7 +77,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then - EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" + EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry 10.0.0.0/8" fi # Optional: customize runtime config diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d5328abefa..67ceeafc4c 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -49,6 +49,9 @@ NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} +# Extra docker options for nodes. +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" + # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET @@ -92,7 +95,7 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then - EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" + EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry 10.0.0.0/8" fi # Optional: Install cluster DNS. diff --git a/cluster/kubemark/config-default.sh b/cluster/kubemark/config-default.sh index d0a4b39124..344f7f76a0 100644 --- a/cluster/kubemark/config-default.sh +++ b/cluster/kubemark/config-default.sh @@ -50,6 +50,9 @@ CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PE SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" +# Extra docker options for nodes. +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" + # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET @@ -60,7 +63,7 @@ ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-false}" ENABLE_CLUSTER_LOGGING="${KUBE_ENABLE_CLUSTER_LOGGING:-false}" # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} == "true" ]]; then - EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" + EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry 10.0.0.0/8" fi ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-false}" diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 3545aa3ddf..8e20305c48 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -75,8 +75,8 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" # --insecure-registry for local registries, or globally configuring selinux options # TODO Enable selinux when Fedora 21 repositories get an updated docker package # see https://bugzilla.redhat.com/show_bug.cgi?id=1216151 -#EXTRA_DOCKER_OPTS="-b=cbr0 --selinux-enabled --insecure-registry 10.0.0.0/8" -EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" +#EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-} -b=cbr0 --selinux-enabled --insecure-registry 10.0.0.0/8" +EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-} --insecure-registry 10.0.0.0/8" # Flag to tell the kubelet to enable CFS quota support ENABLE_CPU_CFS_QUOTA="${KUBE_ENABLE_CPU_CFS_QUOTA:-true}"