github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 12:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25841 from ojarjur/ojarjur/registry-mirror

Browse Source 
Automatic merge from submit-queue

GCE: Enable using gcr.io as a Docker registry mirror.

```release-note
Use gcr.io as a Docker registry mirror when setting up a cluster in GCE.
```
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

This only affects clusters running under GCE.
This commit is contained in:
k8s-merge-robot
2016-06-06 14:50:05 -07:00
parent 5c41b93d8b 338b33f3f4
commit 98c432a943
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,9 @@ EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}"
SERVICE_CLUSTER_IP_RANGE="${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: Deploy a L7 loadbalancer controller to fulfill Ingress requests:
# glbc - CE L7 Load Balancer Controller
ENABLE_L7_LOADBALANCING="${KUBE_ENABLE_L7_LOADBALANCING:-glbc}"