Merge pull request kubernetes#2080 from jbeda/2078-fix-containervm

Use the Container VM image in the google-cloud project.
duda · Oct 30, 2014 · f75eda2 · f75eda2
2 parents b2b090c + 4c8dbbc
commit f75eda2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -23,6 +23,7 @@ NUM_MINIONS=4
 # for containervm image, so that gcloud/gcutil will expand this
 # to the latest supported image.
 IMAGE=container-vm-v20141016
+IMAGE_PROJECT=google-containers
 NETWORK=default
 INSTANCE_PREFIX=kubernetes
 MASTER_NAME="${INSTANCE_PREFIX}-master"

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -23,6 +23,7 @@ NUM_MINIONS=2
 # for containervm image, so that gcloud/gcutil will expand this
 # to the latest supported image.
 IMAGE=container-vm-v20141016
+IMAGE_PROJECT=google-containers
 NETWORK=e2e
 INSTANCE_PREFIX="e2e-test-${USER}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -239,13 +239,6 @@ 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
@@ -310,7 +303,7 @@ function kube-up {
     --sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
     --zone "${ZONE}" \
     --machine_type "${MASTER_SIZE}" \
-    --image "${IMAGE}" \
+    --image "projects/${IMAGE_PROJECT}/global/images/${IMAGE}" \
     --tags "${MASTER_TAG}" \
     --network "${NETWORK}" \
     --service_account_scopes="storage-ro,compute-rw" \
@@ -339,7 +332,7 @@ function kube-up {
       --sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
       --zone "${ZONE}" \
       --machine_type "${MINION_SIZE}" \
-      --image "${IMAGE}" \
+      --image "projects/${IMAGE_PROJECT}/global/images/${IMAGE}" \
       --tags "${MINION_TAG}" \
       --network "${NETWORK}" \
       --service_account_scopes "${MINION_SCOPES}" \