github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Bump GCE debian image to container-v1-3-v20160604

Browse Source 
Includes Docker 1.11.2

Wait for enough results from
http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-container-vm/
before merging.

c.f. https://github.com/kubernetes/test-infra/pull/116
This commit is contained in:
Zach Loafman 2016-06-04 20:37:25 -07:00
parent 411696d5ef
commit 20408cad17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# By default a cluster will be started with the master on GCI and nodes on
# containervm. If you are updating the containervm version, update this
# variable.
CVM_VERSION=container-v1-3-v20160517
CVM_VERSION=container-v1-3-v20160604
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}

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

@ -41,7 +41,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# By default a cluster will be started with the master on GCI and nodes on
# containervm. If you are updating the containervm version, update this
# variable.
CVM_VERSION=container-v1-3-v20160517
CVM_VERSION=container-v1-3-v20160604
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}