From d32b9a692533d94c90fecafe4525fe287f6cd887 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Thu, 7 Sep 2017 14:33:28 -0700 Subject: [PATCH] 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. --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 9 ++++----- cluster/kubemark/gce/config-default.sh | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index fd3fbce4d36..c86440165c0 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -73,7 +73,7 @@ fi # 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-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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index e4f612b26fc..2c4e844c9ff 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -45,7 +45,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true} KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true} 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 MASTER_OS_DISTRIBUTION="container-linux" fi @@ -67,13 +67,12 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then fi # By default a cluster will be started with the master and nodes -# on Container-VM, the deprecated OS. Some tests assume container-VM, -# and only when that is fixed can we use Container-Optimized OS -# (cos, gci) as we do in config-default.sh. +# on Container-optimized OS (cos, previously known as gci). If +# you are updating the os image versions, update this 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-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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 2925837494f..ee4b6f4e713 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -34,7 +34,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_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} NETWORK=${KUBE_GCE_NETWORK:-e2e}