github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10296 from thockin/eol-registry-cache

Browse Source 
EOL Google's registry caching mirror
This commit is contained in:
Brendan Burns 2015-06-25 14:52:27 -07:00
commit 74806a1047
7 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/aws/config-default.sh
View File

@ -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). # Otherwise amazon-given public ip will be used (it'll change with reboot).
MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" 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. # Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"

3
cluster/aws/config-test.sh
View File

@ -47,9 +47,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" 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. # Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"

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

@ -47,9 +47,6 @@ POLL_SLEEP_INTERVAL=3
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
ALLOCATE_NODE_CIDRS=true 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. # Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"

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

@ -47,9 +47,6 @@ MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/loggin
POLL_SLEEP_INTERVAL=3 POLL_SLEEP_INTERVAL=3
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET 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. # Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"

7
cluster/gce/configure-vm.sh
View File

@ -550,13 +550,6 @@ function salt-docker-opts() {
DOCKER_OPTS="${EXTRA_DOCKER_OPTS}" DOCKER_OPTS="${EXTRA_DOCKER_OPTS}"
fi 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 if [[ -n "{DOCKER_OPTS}" ]]; then
cat <<EOF >>/etc/salt/minion.d/grains.conf cat <<EOF >>/etc/salt/minion.d/grains.conf
docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")' docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'

1
cluster/gce/coreos/helper.sh
View File

@ -87,7 +87,6 @@ MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE})
KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME}) KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME})
ZONE=$(yaml-quote ${ZONE}) ZONE=$(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS:-}) EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS:-})
ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
PROJECT_ID=$(yaml-quote ${PROJECT}) PROJECT_ID=$(yaml-quote ${PROJECT})
KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME}) KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME})
RKT_VERSION=$(yaml-quote ${RKT_VERSION}) RKT_VERSION=$(yaml-quote ${RKT_VERSION})

1
cluster/gce/debian/helper.sh
View File

@ -73,7 +73,6 @@ EOF
KUBERNETES_MASTER: "false" KUBERNETES_MASTER: "false"
ZONE: $(yaml-quote ${ZONE}) ZONE: $(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS:-}) 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_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-})
KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-}) KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-})
EOF EOF