Skip to content

K
k3s
Commit 280f99af authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

EOL our registry caching mirror

Docker's v1 registry has gotten slower and slower, and they have no interest in fixing it. Using a mirror forces v1 mode. Measurements show that v1 with our mirror is slower than v2 with docker's registry in just about all metrics.
parent cf2bd9a1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 21 deletions
cluster/aws/config-default.sh
View file @ 280f99af
...@@ -50,9 +50,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" ...@@ -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}"
......
cluster/aws/config-test.sh
View file @ 280f99af
...@@ -47,9 +47,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" ...@@ -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}"
......
cluster/gce/config-default.sh
View file @ 280f99af
...@@ -47,9 +47,6 @@ POLL_SLEEP_INTERVAL=3 ...@@ -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}"
......
cluster/gce/config-test.sh
View file @ 280f99af
...@@ -47,9 +47,6 @@ MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/loggin ...@@ -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}"
......
cluster/gce/configure-vm.sh
View file @ 280f99af
...@@ -550,13 +550,6 @@ function salt-docker-opts() { ...@@ -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")'
......
cluster/gce/coreos/helper.sh
View file @ 280f99af
...@@ -87,7 +87,6 @@ MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE}) ...@@ -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})
......
cluster/gce/debian/helper.sh
View file @ 280f99af
...@@ -73,7 +73,6 @@ EOF ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment