mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #32738 from Amey-D/gci-version-v1.4
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:
commit
6fd94968e1
@ -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
|
||||
# variable.
|
||||
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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
|
||||
|
@ -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
|
||||
# variable.
|
||||
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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
|
||||
|
@ -16,6 +16,6 @@ images:
|
||||
image: e2e-node-containervm-v20160321-image
|
||||
project: kubernetes-node-e2e-images
|
||||
gci-family:
|
||||
image_regex: gci-dev-54-8743-3-0
|
||||
image_regex: gci-dev-55-8820-0-0
|
||||
project: google-containers
|
||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
|
||||
|
Loading…
Reference in New Issue
Block a user