diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 1bcf7b05c1..12f6f8fcd7 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -70,7 +70,7 @@ fi CVM_VERSION=${CVM_VERSION:-container-vm-v20170214} # NOTE: Update the kernel commit SHA in cluster/addons/nvidia-gpus/cos-installer-daemonset.yaml # while updating the COS version here. -GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2} +GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 2ba8163799..bcc3c10295 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -67,7 +67,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-v20170214} -GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2} +GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index a6d497b730..173c866d21 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -38,27 +38,36 @@ else fi if [[ "${MASTER_OS_DISTRIBUTION}" == "gci" ]]; then - # If the master image is not set, we use the latest GCI image. - # Otherwise, we respect whatever is set by the user. - MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${GCI_VERSION}} - MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} + DEFAULT_GCI_PROJECT=google-containers + if [[ "${GCI_VERSION}" == "cos"* ]]; then + DEFAULT_GCI_PROJECT=cos-cloud + fi + MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-${DEFAULT_GCI_PROJECT}} + # If the master image is not set, we use the latest GCI image. + # Otherwise, we respect whatever is set by the user. + MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${GCI_VERSION}} elif [[ "${MASTER_OS_DISTRIBUTION}" == "debian" ]]; then - MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${CVM_VERSION}} - MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} + MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${CVM_VERSION}} + MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} fi # Sets node image based on the specified os distro. Currently this function only # supports gci and debian. function set-node-image() { - if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then - # If the node image is not set, we use the latest GCI image. - # Otherwise, we respect whatever is set by the user. - NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} - NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} - elif [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then - NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} - NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} - fi + if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then + DEFAULT_GCI_PROJECT=google-containers + if [[ "${GCI_VERSION}" == "cos"* ]]; then + DEFAULT_GCI_PROJECT=cos-cloud + fi + + # If the node image is not set, we use the latest GCI image. + # Otherwise, we respect whatever is set by the user. + NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} + NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-${DEFAULT_GCI_PROJECT}} + elif [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then + NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} + NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} + fi } set-node-image diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 8aee025932..1fc342e918 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -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-stable-56-9000-84-2} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-beta-59-9460-20-0} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NETWORK=${KUBE_GCE_NETWORK:-default} diff --git a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml index 883f4247e3..95d1ee2f28 100644 --- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml +++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml @@ -49,21 +49,21 @@ images: tests: - 'resource tracking for 105 pods per node \[Benchmark\]' gci-resource1: - image: gci-stable-56-9000-84-2 + image: cos-beta-59-9460-20-0 project: google-containers machine: n1-standard-1 metadata: "user-data