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:

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

@@ -5914,6 +5914,14 @@ def test_aks_create_with_auto_upgrade_channel(self, resource_group, resource_gro
             self.check('autoUpgradeProfile.upgradeChannel', 'stable')
         ])
 
+        # update upgrade channel to none, need to answer prompt
+        update_cmd = 'aks update --resource-group={resource_group} --name={name} ' \
+                     '--auto-upgrade-channel none --yes'
+        self.cmd(update_cmd, checks=[
+            self.check('provisioningState', 'Succeeded'),
+            self.check('autoUpgradeProfile.upgradeChannel', 'none')
+        ])
+
         # delete
         self.cmd(
             'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()])

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py

@@ -22,7 +22,6 @@
     _get_command_context,
     _update_addons,
     aks_stop,
-    aks_update,
     k8s_install_kubectl,
     k8s_install_kubelogin,
     merge_kubernetes_configurations,
@@ -821,43 +820,6 @@ def test_aks_stop(self):
         )
         self.assertEqual(aks_stop(self.cmd, self.client, "rg", "name", False), None)
 
-    @mock.patch('azure.cli.command_modules.acs.custom.prompt_y_n', return_value=True)
-    @mock.patch('azure.cli.command_modules.acs.custom.get_subscription_id', return_value='00000000-0000-0000-0000-000000000000')
-    @mock.patch('azure.cli.command_modules.acs.custom.cf_agent_pools')
-    @mock.patch('azure.cli.command_modules.acs.managed_cluster_decorator.AKSManagedClusterUpdateDecorator.update_mc_profile_default')
-    @mock.patch('azure.cli.command_modules.acs.managed_cluster_decorator.AKSManagedClusterUpdateDecorator.update_kubernetes_version_and_orchestrator_version')
-    @mock.patch('azure.cli.command_modules.acs.managed_cluster_decorator.AKSManagedClusterUpdateDecorator.update_mc')
-    def test_aks_update_auto_upgrade_channel_none(self, mock_update_mc, mock_update_kubernetes_version_and_orchestrator_version, mock_update_mc_profile_default, mock_cf_agent_pools, mock_get_subscription_id, mock_prompt_y_n):
-        resource_group_name = 'test_rg'
-        name = 'test_cluster'
-        auto_upgrade_channel = 'none'
-
-        # Create a ManagedCluster object
-        mc = mock.Mock()
-        mc.kubernetes_version = '1.18.14'
-        mc.agent_pool_profiles = [
-            mock.Mock(orchestrator_version='1.18.14'),
-            mock.Mock(orchestrator_version='1.19.7')
-        ]
-        mc.current_kubernetes_version = '1.21.2'
-        mc.agent_pool_profiles[0].current_orchestrator_version = '1.21.2'
-        mc.agent_pool_profiles[1].current_orchestrator_version = '1.21.2'
-
-        mock_update_mc_profile_default.return_value = mc
-        mock_update_kubernetes_version_and_orchestrator_version.return_value = mc
-
-        aks_update(
-            cmd=self.cmd,
-            client=self.client,
-            resource_group_name=resource_group_name,
-            name=name,
-            auto_upgrade_channel=auto_upgrade_channel
-        )
-
-        # Check if update_kubernetes_version_and_orchestrator_version was called
-        mock_update_kubernetes_version_and_orchestrator_version.assert_called_once_with(mc)
-        # Check if update_mc was called
-        mock_update_mc.assert_called_once_with(mc)
 
 class TestRunCommand(unittest.TestCase):
     def test_get_command_context_invalid_file(self):