Merge branch 'develop' into chzheng/docker_image_flag

Author: ycchenzheng

src/xpk/core/nap.py

@@ -99,14 +99,25 @@ def enable_autoprovisioning_on_cluster(
       f' --region={zone_to_region(args.zone)} --enable-autoprovisioning'
       ' --autoprovisioning-config-file'
       f' {autoprovisioning_config.config_filename}'
-      ' --autoscaling-profile=optimize-utilization'
   )
   task = 'Update cluster with autoprovisioning enabled'
   return_code = run_command_with_updates(command, task, args)
   if return_code != 0:
     xpk_print(f'{task} request returned ERROR {return_code}')
     return autoprovisioning_config, return_code
 
+  command = (
+      'gcloud container clusters update'
+      f' {args.cluster} --project={args.project}'
+      f' --region={zone_to_region(args.zone)}'
+      ' --autoscaling-profile=optimize-utilization'
+  )
+  task = 'Update cluster with autoscaling-profile'
+  return_code = run_command_with_updates(command, task, args)
+  if return_code != 0:
+    xpk_print(f'{task} request returned ERROR {return_code}')
+    return autoprovisioning_config, return_code
+
   # Update created accelerator node pools to support autoprovisioning.
   existing_node_pool_names, return_code = get_all_nodepools_programmatic(args)
   if return_code != 0: