Merge pull request #26382 from dchen1107/docker

Bump Node Image to  container-v1-3-v20160517
This commit is contained in:
Alex Mohr 2016-05-26 15:53:22 -07:00
commit 0b7614d6cd
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# channel.
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-container-vm-v20160321}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-container-v1-3-v20160517}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}

View File

@ -40,7 +40,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# channel.
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-container-vm-v20160321}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-container-v1-3-v20160517}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}