github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-21 17:15:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12997 from zmerlynn/automated-cherry-pick-of-#12840-upstream-release-1.0

Browse Source 
Automated cherry pick of #12840
This commit is contained in:
Robert Bailey
2015-08-20 17:55:46 -07:00
parent c4fcaeed28 e2cc5cc008
commit b4f593fb39
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}