Fix ip-alias testing.

IP aliases are an alpha feature, and node accelerators are a beta feature. $gcloud determines which is appropriate. Before, this would try to run "gcloud alpha beta", which is incoherent.

Fix ip-alias testing.
62235c3b · Ryan Hitchman · 77b2e630 · 62235c3b
Commit 62235c3b authored May 10, 2017 by Ryan Hitchman
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

util.sh cluster/gce/util.sh +10 -7

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -505,6 +505,15 @@ function create-node-template() {
  fi

  local gcloud="gcloud"
+
+  local accelerator_args=""
+  # VMs with Accelerators cannot be live migrated.
+  # More details here - https://cloud.google.com/compute/docs/gpus/add-gpus#create-new-gpu-instance
+  if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
+    accelerator_args="--maintenance-policy TERMINATE --restart-on-failure --accelerator ${NODE_ACCELERATORS}"
+    gcloud="gcloud beta"
+  fi
+
  if [[ "${ENABLE_IP_ALIASES:-}" == 'true' ]]; then
    gcloud="gcloud alpha"
  fi
@@ -527,16 +536,10 @@ function create-node-template() {
    "${IP_ALIAS_SUBNETWORK:-}" \
    "${IP_ALIAS_SIZE:-}")

-  local accelerator_args=""
-  # VMs with Accelerators cannot be live migrated.
-  # More details here - https://cloud.google.com/compute/docs/gpus/add-gpus#create-new-gpu-instance
-  if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
-      accelerator_args="--maintenance-policy TERMINATE --restart-on-failure --accelerator ${NODE_ACCELERATORS}"
-  fi
  local attempt=1
  while true; do
    echo "Attempt ${attempt} to create ${1}" >&2
-    if ! ${gcloud} beta compute instance-templates create \
+    if ! ${gcloud} compute instance-templates create \
      "$template_name" \
      --project "${PROJECT}" \
      --machine-type "${NODE_SIZE}" \