Merge pull request #41449 from zmerlynn/container-vm-v20170214

Automatic merge from submit-queue (batch tested with PRs 41196, 41252, 41300, 39179, 41449) Bump GCE ContainerVM to container-vm-v20170214 `container-vm-v20170214` is a re-build of the `docker-runc` in `container-vm-v20170201`, and should clear the GCE slow tests. c.f. #40828 ```release-note Bump GCE ContainerVM to container-vm-v20170214 to address CVE-2016-9962. ```
kubernetes · Feb 15, 2017 · 0e86d98 · 0e86d98
2 parents 3a6fa67 + b7229ed
commit 0e86d98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -58,7 +58,7 @@ fi
 # containervm. If you are updating the containervm version, update this
 # 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=${CVM_VERSION:-container-vm-v20170201}
+CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
 GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -59,7 +59,7 @@ fi
 # containervm. If you are updating the containervm version, update this
 # 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=${CVM_VERSION:-container-vm-v20170201}
+CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
 GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}