Merge pull request #33194 from dchen1107/master

Automatic merge from submit-queue Update the containervm image to the latest one (container-v1-3-v20160… Node e2e is running with old containervm image which only has docker 1.9.1. This pr fixed such issue.

Merge pull request #33194 from dchen1107/master
03c698ce · Kubernetes Submit Queue · GitHub · 290982d6 · f1f16fe0 · 03c698ce
Commit 03c698ce authored Sep 21, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

config-default.sh cluster/gce/config-default.sh +2 -1

config-test.sh cluster/gce/config-test.sh +2 -1

image-config.yaml test/e2e_node/jenkins/image-config.yaml +1 -1

No files found.
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -40,7 +40,8 @@ MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gc
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
 # 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.
+# variable. Also please update corresponding image for node e2e at:
+# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
 CVM_VERSION=container-v1-3-v20160604
 GCI_VERSION="gci-dev-55-8820-0-0"
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}

--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -41,7 +41,8 @@ MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gc
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
 # 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.
+# variable. Also please update corresponding image for node e2e at:
+# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
 CVM_VERSION=container-v1-3-v20160604
 GCI_VERSION="gci-dev-55-8820-0-0"
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}

--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -13,7 +13,7 @@ images:
    project: coreos-cloud
    metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
  containervm:
-    image: e2e-node-containervm-v20160321-image
+    image: e2e-node-containervm-v20160604-image
    project: kubernetes-node-e2e-images
  gci-family:
    image_regex: gci-dev-55-8820-0-0