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

Merge pull request #40828 from zmerlynn/container-vm-v20170201

Browse Source 
Automatic merge from submit-queue

Bump GCE to container-vm-v20170201

```release-note
Bump GCE ContainerVM to container-vm-v20170201 to address CVE-2016-9962.
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-01 17:27:29 -08:00 committed by GitHub
commit f14a6530c2
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

@ -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-v20170117}
CVM_VERSION=${CVM_VERSION:-container-vm-v20170201}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}

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

@ -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-v20170117}
CVM_VERSION=${CVM_VERSION:-container-vm-v20170201}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}