Skip to content

K
k3s
Commit 76d023ca authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40094 from zmerlynn/cvm-v20170117

Automatic merge from submit-queue (batch tested with PRs 36467, 36528, 39568, 40094, 39042) Bump GCE to container-vm-v20170117 Base image update only, no kubelet or Docker updates. ```release-note Update GCE ContainerVM deployment to container-vm-v20170117 to pick up CVE fixes in base image. ```
parents b9f02bd2 a0b8fd61
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/gce/config-default.sh
View file @ 76d023ca
...@@ -50,7 +50,7 @@ fi ...@@ -50,7 +50,7 @@ fi
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=container-vm-v20161208 CVM_VERSION=${CVM_VERSION:-container-vm-v20170117}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0} GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
......
cluster/gce/config-test.sh
View file @ 76d023ca
...@@ -51,7 +51,7 @@ fi ...@@ -51,7 +51,7 @@ fi
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=container-vm-v20161208 CVM_VERSION=${CVM_VERSION:-container-vm-v20170117}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0} GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment