github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 13:14:05 +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

1
cluster/common.sh
View File

@@ -495,6 +495,7 @@ SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME})
ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false})
ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none})
DOCKER_REGISTRY_MIRROR_URL: $(yaml-quote ${DOCKER_REGISTRY_MIRROR_URL:-})
ENABLE_L7_LOADBALANCING: $(yaml-quote ${ENABLE_L7_LOADBALANCING:-none})
ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false})
ENABLE_CLUSTER_UI: $(yaml-quote ${ENABLE_CLUSTER_UI:-false})