github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32738 from Amey-D/gci-version-v1.4

Browse Source 
Automatic merge from submit-queue

Bump up GCI version.

```release-note
   Upgrading Container-VM base image for k8s on GCE. Brief changelog as follows:
    - Fixed performance regression in veth device driver
    - Docker and related binaries are statically linked
    - Fixed the issue of systemd being oom-killable
```

Fixes #32596

This needs a cherrypick into v1.4 release branch because it is fixing v1.4 release blocking issues. This patch is easy and safe to rollback in case of emergencies.

@vishh can you please review?

Fixes #32596 and many other issues.
cc/ @kubernetes/goog-image  FYI
This commit is contained in:
Kubernetes Submit Queue 2016-09-20 16:30:01 -07:00 committed by GitHub
commit 6fd94968e1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. # variable.
CVM_VERSION=container-v1-3-v20160604 CVM_VERSION=container-v1-3-v20160604
GCI_VERSION="gci-dev-54-8743-3-0" GCI_VERSION="gci-dev-55-8820-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}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

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

@ -43,7 +43,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. # variable.
CVM_VERSION=container-v1-3-v20160604 CVM_VERSION=container-v1-3-v20160604
GCI_VERSION="gci-dev-54-8743-3-0" GCI_VERSION="gci-dev-55-8820-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}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

2
test/e2e_node/jenkins/image-config.yaml
View File

@ -16,6 +16,6 @@ images:
image: e2e-node-containervm-v20160321-image image: e2e-node-containervm-v20160321-image
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci-family:
image_regex: gci-dev-54-8743-3-0 image_regex: gci-dev-55-8820-0-0
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"