diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index f5e3402dcc1..eace78ebf50 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -50,9 +50,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" # Otherwise amazon-given public ip will be used (it'll change with reboot). MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" -# When set to true, Docker Cache is enabled by default as part of the cluster bring up. -ENABLE_DOCKER_REGISTRY_CACHE=true - # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 01221dc5327..f05c9b0b1b0 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -47,9 +47,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" -# When set to true, Docker Cache is enabled by default as part of the cluster bring up. -ENABLE_DOCKER_REGISTRY_CACHE=true - # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index ab07b09b4c2..56e2a029e38 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -47,9 +47,6 @@ POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET ALLOCATE_NODE_CIDRS=true -# When set to true, Docker Cache is enabled by default as part of the cluster bring up. -ENABLE_DOCKER_REGISTRY_CACHE=true - # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index c944e59c6e1..0e4ffbd4dea 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -47,9 +47,6 @@ MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/loggin POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET -# When set to true, Docker Cache is enabled by default as part of the cluster bring up. -ENABLE_DOCKER_REGISTRY_CACHE=true - # Optional: Install node monitoring. ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index ad36f41d198..5ac6abc0533 100644 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -550,13 +550,6 @@ function salt-docker-opts() { DOCKER_OPTS="${EXTRA_DOCKER_OPTS}" fi - # Decide whether to enable the cache - if [[ "${ENABLE_DOCKER_REGISTRY_CACHE}" == "true" ]]; then - REGION=$(echo "${ZONE}" | cut -f 1,2 -d -) - echo "Enable docker registry cache at region: " $REGION - DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror='https://${REGION}.docker-cache.clustermaster.net'" - fi - if [[ -n "{DOCKER_OPTS}" ]]; then cat <>/etc/salt/minion.d/grains.conf docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")' diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index 4b6c7f8de5e..27cdb087a79 100644 --- a/cluster/gce/coreos/helper.sh +++ b/cluster/gce/coreos/helper.sh @@ -87,7 +87,6 @@ MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE}) KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME}) ZONE=$(yaml-quote ${ZONE}) EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS:-}) -ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false}) PROJECT_ID=$(yaml-quote ${PROJECT}) KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME}) RKT_VERSION=$(yaml-quote ${RKT_VERSION}) diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh index 3bed23afd9e..1f677072ef3 100644 --- a/cluster/gce/debian/helper.sh +++ b/cluster/gce/debian/helper.sh @@ -73,7 +73,6 @@ EOF KUBERNETES_MASTER: "false" ZONE: $(yaml-quote ${ZONE}) EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS:-}) -ENABLE_DOCKER_REGISTRY_CACHE: $(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false}) KUBELET_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-}) KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-}) EOF