Merge pull request #53350 from ixdy/gce-config-test

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. container-vm is deprecated, so don't use it for GCE test clusters **What this PR does / why we need it**: container-vm is deprecated. We shouldn't start test clusters using it for nodes. **Release note**: ```release-note NONE ``` x-ref #48279 which started this work

Merge pull request #53350 from ixdy/gce-config-test
f15634f4 · Kubernetes Submit Queue · GitHub · 3f1a2e43 · 164bc174 · f15634f4
Commit f15634f4 authored Oct 06, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 06, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config-test.sh cluster/gce/config-test.sh +1 -1

No files found.
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -75,7 +75,7 @@ CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
 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}}
+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:-}