github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 08:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1492 from jbeda/backports-fix

Browse Source 
Change back to generic image description now that GCE is fixed.
This commit is contained in:
Joe Beda 2014-09-29 12:27:51 -07:00
commit 648a400e36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ MASTER_SIZE=g1-small
MINION_SIZE=g1-small MINION_SIZE=g1-small
NUM_MINIONS=4 NUM_MINIONS=4
# gcloud/gcutil will expand this to the latest supported image. # gcloud/gcutil will expand this to the latest supported image.
IMAGE=projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140924 IMAGE=backports-debian-7-wheezy
NETWORK=default NETWORK=default
INSTANCE_PREFIX=kubernetes INSTANCE_PREFIX=kubernetes
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"

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

@ -20,7 +20,7 @@ MASTER_SIZE=g1-small
MINION_SIZE=g1-small MINION_SIZE=g1-small
NUM_MINIONS=2 NUM_MINIONS=2
# gcloud/gcutil will expand this to the latest supported image. # gcloud/gcutil will expand this to the latest supported image.
IMAGE=projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140924 IMAGE=backports-debian-7-wheezy
NETWORK=e2e NETWORK=e2e
INSTANCE_PREFIX="e2e-test-${USER}" INSTANCE_PREFIX="e2e-test-${USER}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"