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

Merge pull request #2537 from dchen1107/mirror-registry

Browse Source 
Enable docker registry cache. By default it is off
This commit is contained in:
Tim Hockin 2014-11-25 03:46:35 +08:00
commit b6d8215f3a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/gce/templates/salt-minion.sh
View File

@ -36,6 +36,17 @@ grains:
cloud: gce cloud: gce
EOF EOF
# Decide if 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="--registry-mirror=\"https://${REGION}.docker-cache.clustermaster.net\""
cat <<EOF >>/etc/salt/minion.d/grains.conf
docker_opts: $DOCKER_OPTS
EOF
fi
install-salt install-salt
# Wait a few minutes and trigger another Salt run to better recover from # Wait a few minutes and trigger another Salt run to better recover from

2
cluster/gce/util.sh
View File

@ -328,8 +328,10 @@ function kube-up {
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
( (
echo "#! /bin/bash" echo "#! /bin/bash"
echo "ZONE='${ZONE}'"
echo "MASTER_NAME='${MASTER_NAME}'" echo "MASTER_NAME='${MASTER_NAME}'"
echo "MINION_IP_RANGE='${MINION_IP_RANGES[$i]}'" echo "MINION_IP_RANGE='${MINION_IP_RANGES[$i]}'"
echo "ENABLE_DOCKER_REGISTRY_CACHE='${ENABLE_DOCKER_REGISTRY_CACHE:-false}'"
grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/common.sh" grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/common.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/salt-minion.sh" grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/salt-minion.sh"
) > "${KUBE_TEMP}/minion-start-${i}.sh" ) > "${KUBE_TEMP}/minion-start-${i}.sh"