pr comments

Author: yewmsft

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -843,8 +843,6 @@ def aks_update(
     try:
         # update mc profile
         mc = aks_update_decorator.update_mc_profile_default()
-        # Update kubernetes_version and orchestrator_version based on auto_upgrade_channel
-        mc = aks_update_decorator.update_kubernetes_version_and_orchestrator_version(mc)
     except DecoratorEarlyExitException:
         # exit gracefully
         return None

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -8482,6 +8482,8 @@ def update_mc_profile_default(self) -> ManagedCluster:
         mc = self.update_node_resource_group_profile(mc)
         # update bootstrap profile
         mc = self.update_bootstrap_profile(mc)
+        # update kubernetes version and orchestrator version
+        mc = self.update_kubernetes_version_and_orchestrator_version(mc)
         return mc
 
     def update_kubernetes_version_and_orchestrator_version(self, mc: ManagedCluster) -> ManagedCluster:
@@ -8500,7 +8502,7 @@ def update_kubernetes_version_and_orchestrator_version(self, mc: ManagedCluster)
                 "currentKubernetesVersion, all agent pools orchestratorVersion will be set to the value of "
                 "currentOrchestratorVersion respectively. Continue?"
             )
-            if not prompt_y_n(warning_message, default="n"):
+            if not self.context.get_yes() and not prompt_y_n(warning_message, default="n"):
                 raise CLIError("Operation cancelled by user.")
 
             # Set kubernetes version to match the current kubernetes version if it has a value