Skip to content

K
k3s
Commit d32b9a69 authored by Adam Worrall's avatar Adam Worrall
Browse files
Options

Use COS for nodes in cluster by default, and bump COS.

Addresses part of issue #51487. This is a big change for testing; any testjobs that do not set an explicit KUBE_NODE_OS_DISTRIBUTION will have been running on CVM, but after this PR will start running COS. CVM is being deprecated, and falls out of support on 2018/10/01. In addition, bump the patch version of COS from cos-stable-60-9592-84-0 to cos-stable-60-9592-90-0.
parent 42481988
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
cluster/gce/config-default.sh
View file @ d32b9a69
...@@ -73,7 +73,7 @@ fi ...@@ -73,7 +73,7 @@ fi
# Also please update corresponding image for node e2e at: # 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=${CVM_VERSION:-container-vm-v20170627} CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-60-9592-84-0} GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-60-9592-90-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}}
......
cluster/gce/config-test.sh
View file @ d32b9a69
...@@ -45,7 +45,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true} ...@@ -45,7 +45,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true} KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
if [[ "${MASTER_OS_DISTRIBUTION}" == "coreos" ]]; then if [[ "${MASTER_OS_DISTRIBUTION}" == "coreos" ]]; then
MASTER_OS_DISTRIBUTION="container-linux" MASTER_OS_DISTRIBUTION="container-linux"
fi fi
...@@ -67,13 +67,12 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then ...@@ -67,13 +67,12 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
fi fi
# By default a cluster will be started with the master and nodes # By default a cluster will be started with the master and nodes
# on Container-VM, the deprecated OS. Some tests assume container-VM, # on Container-optimized OS (cos, previously known as gci). If
# and only when that is fixed can we use Container-Optimized OS # you are updating the os image versions, update this variable.
# (cos, gci) as we do in config-default.sh.
# Also please update corresponding image for node e2e at: # 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=${CVM_VERSION:-container-vm-v20170627} CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-60-9592-84-0} GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-60-9592-90-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
......
cluster/kubemark/gce/config-default.sh
View file @ d32b9a69
...@@ -34,7 +34,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} ...@@ -34,7 +34,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-gci} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-gci}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-stable-60-9592-84-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-stable-60-9592-90-0}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NETWORK=${KUBE_GCE_NETWORK:-e2e} NETWORK=${KUBE_GCE_NETWORK:-e2e}
......
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