From ba2dd9ea4c879272e94e912ae504a6ba94e20e13 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Thu, 29 Jun 2017 09:28:34 -0700 Subject: [PATCH 1/4] Use Container-optimzed OS images for node --- cluster/gce/config-default.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 659af93d788..6f778651bf0 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then NODE_ACCELERATORS="" fi -# By default a cluster will be started with the master on GCI and nodes on -# containervm. If you are updating the containervm version, update this -# variable. Also please update corresponding image for node e2e at: +# By default a cluster will be started with the master and nodes +# 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-59-9460-64-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} -NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} GCE_API_ENDPOINT=${KUBE_GCE_API_ENDPOINT:-} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} From ddeab2a69af9f442ee03729c676486deb8d50878 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Thu, 29 Jun 2017 13:44:07 -0700 Subject: [PATCH 2/4] Update NODE_OS_DISTRIBUTION from debian to gci This in turn drives how NODE_IMAGE is set --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 11 ++++++----- cluster/kubemark/gce/config-default.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 6f778651bf0..476c505bbb0 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -42,7 +42,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true} KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-false} 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 diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 76374026179..09aef35b232 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -41,7 +41,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 @@ -62,15 +62,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then NODE_ACCELERATORS="" fi -# By default a cluster will be started with the master on GCI and nodes on -# containervm. If you are updating the containervm version, update this -# variable. Also please update corresponding image for node e2e at: +# By default a cluster will be started with the master and nodes +# 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-59-9460-64-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} -NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index dd9df48f807..616f8ad4775 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -35,7 +35,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci} -NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian} +NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-gci} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-stable-59-9460-64-0} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} From 72f58e09c16f7de250711f80b3c16e5a534a63e2 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Thu, 29 Jun 2017 13:59:09 -0700 Subject: [PATCH 3/4] Leave the test jobs running on CVM after all. --- cluster/gce/config-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 09aef35b232..198ea45cba7 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -41,7 +41,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:-gci}} +NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}} if [[ "${MASTER_OS_DISTRIBUTION}" == "coreos" ]]; then MASTER_OS_DISTRIBUTION="container-linux" fi From 2196be7c7fb96cb51dc98bac9159167ffb3df296 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Tue, 11 Jul 2017 14:53:49 -0700 Subject: [PATCH 4/4] Leave testing on CVM by default Avoid breaking tests that assume they're testing CVM. --- cluster/gce/config-test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 198ea45cba7..28ed5bcca96 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then fi # By default a cluster will be started with the master and nodes -# on Container-optimized OS (cos, previously known as gci). If -# you are updating the os image versions, update this variable. +# 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. # 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-59-9460-64-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} -NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-}