mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #34156 from adityakali/gci
Automatic merge from submit-queue Update GCI_VERSION to gci-dev-55-8866-0-0 Update GCI base image: Change log: * Built-in kubernetes updated to v1.4.0 * Enabled VXLAN and IP_SET config options in kernel to support some networking tools * OpenSSL CVE fixes ```release-note Update GCI base image: * Enabled VXLAN and IP_SET config options in kernel to support some networking tools (ebtools) * OpenSSL CVE fixes ``` cc/ @kubernetes/goog-image cc/ @dchen1107
This commit is contained in:
commit
8bcb85685e
@ -43,7 +43,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
|
||||
# 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=container-v1-3-v20160604
|
||||
GCI_VERSION="gci-dev-55-8820-0-0"
|
||||
GCI_VERSION="gci-dev-55-8866-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}}
|
||||
|
@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
|
||||
# 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=container-v1-3-v20160604
|
||||
GCI_VERSION="gci-dev-55-8820-0-0"
|
||||
GCI_VERSION="gci-dev-55-8866-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-v20160604-image
|
||||
project: kubernetes-node-e2e-images
|
||||
gci-family:
|
||||
image_regex: gci-dev-55-8820-0-0
|
||||
image_regex: gci-dev-55-8866-0-0
|
||||
project: google-containers
|
||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
|
||||
|
Loading…
Reference in New Issue
Block a user