From f1f16fe03acf79d6ecf8c280f23257bf143e35ae Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Wed, 21 Sep 2016 10:24:22 -0700 Subject: [PATCH] Update the containervm image to the latest one (container-v1-3-v20160604). --- cluster/gce/config-default.sh | 3 ++- cluster/gce/config-test.sh | 3 ++- test/e2e_node/jenkins/image-config.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index baf1846ae61..cb87f0f9764 100755 --- 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-54-8743-3-0" MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index b9663ee8413..288862cd462 100755 --- 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-54-8743-3-0" MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml index e9e9f26f19b..3ae2462cb03 100644 --- 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