Skip to content

Commit

Permalink
Merge pull request kubernetes#23313 from zmerlynn/container-vm-v20160321
Browse files Browse the repository at this point in the history 
Auto commit by PR queue bot
(cherry picked from commit 4d98abf)
  • Loading branch information
@eparis
k8s-merge-robot authored and eparis committed Mar 24, 2016
1 parent 916b68f commit 9c4c16a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cluster/gce/config-default.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}


OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160321}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}

OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160321}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
Expand Down

0 comments on commit 9c4c16a

Please sign in to comment.