github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using containervm image for gce by default

pull/6/head
Dawn Chen 2014-10-22 14:42:33 -07:00
parent f6db096741
commit 18685d49ed
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,10 @@ ZONE=us-central1-b
MASTER_SIZE=n1-standard-1
MINION_SIZE=n1-standard-1
NUM_MINIONS=4
# gcloud/gcutil will expand this to the latest supported image.
IMAGE=backports-debian-7-wheezy
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud/gcutil will expand this
# to the latest supported image.
IMAGE=container-vm-v20141016
NETWORK=default
INSTANCE_PREFIX=kubernetes
MASTER_NAME="${INSTANCE_PREFIX}-master"

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

@ -19,8 +19,10 @@ ZONE=us-central1-b
MASTER_SIZE=g1-small
MINION_SIZE=g1-small
NUM_MINIONS=2
# gcloud/gcutil will expand this to the latest supported image.
IMAGE=backports-debian-7-wheezy
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud/gcutil will expand this
# to the latest supported image.
IMAGE=container-vm-v20141016
NETWORK=e2e
INSTANCE_PREFIX="e2e-test-${USER}"
MASTER_NAME="${INSTANCE_PREFIX}-master"

7
cluster/gce/util.sh
View File

@ -239,6 +239,13 @@ function kube-up {
local htpasswd
htpasswd=$(cat "${KUBE_TEMP}/htpasswd")
if ! gcutil getimage "${IMAGE}" > /dev/null 2>&1; then
echo "Adding new image: ${IMAGE}"
gcutil addimage "${IMAGE}" \
"gs://gcp-containers-images/${IMAGE}.tar.gz" \
--project "${PROJECT}"
fi
if ! gcutil getnetwork "${NETWORK}" >/dev/null 2>&1; then
echo "Creating new network for: ${NETWORK}"
# The network needs to be created synchronously or we have a race. The