Merge pull request #21439 from zmerlynn/container-vm-v20160217

Bump GCE to container-vm-v20160217
This commit is contained in:
Phillip Wittrock 2016-02-18 11:39:54 -08:00
commit be803eaf64
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160127}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217}
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}"}

View File

@ -32,7 +32,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160127}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217}
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}"}