github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41027 from dchen1107/master 

Automatic merge from submit-queue (batch tested with PRs 40971, 41027, 40709, 40903, 39369)

Bump GCI to gci-beta-56-9000-80-0

cc/ @Random-Liu @adityakali 

Changelogs since gci-dev-56-8977-0-0 (currently used in Kubernetes):
 - "net.ipv4.conf.eth0.forwarding" and "net.ipv4.ip_forward" may get reset to 0
 - Track CVE-2016-9962 in Docker in GCI
 - Linux kernel CVE-2016-7097
 - Linux kernel CVE-2015-8964
 - Linux kernel CVE-2016-6828
 - Linux kernel CVE-2016-7917
 - Linux kernel CVE-2016-7042
 - Linux kernel CVE-2016-9793
 - Linux kernel CVE-2016-7039 and CVE-2016-8666
 - Linux kernel CVE-2016-8655
 - Toolbox: allow docker image to be loaded from local tarball
 - Update compute-image-package in GCI 
 - Change the product name on /etc/os-release (to COS)
 - Remove 'dogfood' from HWID_OVERRIDE in /etc/lsb-release
 - Include Google NVME extensions to optimize LocalSSD performance.
 - /proc/<pid>/io missing on GCI (enables process stats accounting)
 - Enable BLK_DEV_THROTTLING

cc/ @roberthbailey @fabioy for GKE cluster update
pull/6/head
Kubernetes Submit Queue 2017-02-06 20:57:14 -08:00 committed by GitHub
parent 4db40cbd94 687aa5768b
commit 5d0377d2e2
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ fi
# 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-v20170201}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

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

@ -60,7 +60,7 @@ fi
# 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-v20170201}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

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

@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-gci-dev-56-8977-0-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-gci-beta-56-9000-80-0}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NETWORK=${KUBE_GCE_NETWORK:-default}

6
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View File

@ -49,21 +49,21 @@ images:
tests:
- 'resource tracking for 105 pods per node \[Benchmark\]'
gci-resource1:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

16
test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
View File

@ -1,56 +1,56 @@
---
images:
gci-density1:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 35 pods with 0s? interval \[Benchmark\]'
gci-density2:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
gci-density2-qps60:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
gci-density3:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-2
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
gci-density4:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 100ms interval \[Benchmark\]'
gci-resource1:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3:
image: gci-dev-56-8977-0-0
image: gci-beta-56-9000-80-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

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

@ -3,7 +3,7 @@ images:
image: e2e-node-containervm-v20161208-image
project: kubernetes-node-e2e-images
gci-family:
image_regex: gci-dev-56-8977-0-0
image_regex: gci-beta-56-9000-80-0
project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
ubuntu-docker12:

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

@ -16,6 +16,6 @@ images:
image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images
gci-family:
image_regex: gci-dev-56-8977-0-0 # docker 1.11.2
image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"