Merge pull request #45605 from rmmh/fix-ip-alias

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}" \