[AKS] Revert PR #18825: az aks create/update: Add parameter --auto-upgrade-channel to support auto upgrade (with fix) (#19297)

redo auto upgrade channel change.

Author: charliedmcb

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

@@ -312,6 +312,9 @@
     type: string
     short-summary: How outbound traffic will be configured for a cluster.
     long-summary: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
+  - name: --auto-upgrade-channel
+    type: string
+    short-summary: Specify the upgrade channel for autoupgrade.
   - name: --enable-cluster-autoscaler
     type: bool
     short-summary: Enable cluster autoscaler, default value is false.
@@ -549,6 +552,9 @@
     type: int
     short-summary: Load balancer idle timeout in minutes.
     long-summary: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --auto-upgrade-channel
+    type: string
+    short-summary: Specify the upgrade channel for autoupgrade.
   - name: --attach-acr
     type: string
     short-summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.

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

@@ -64,6 +64,14 @@
     "westus",
 ]
 
+auto_upgrade_channels = [
+    "rapid",
+    "stable",
+    "patch",
+    "node-image",
+    "none"
+]
+
 storage_profile_types = ["StorageAccount", "ManagedDisks"]
 nodepool_mode_type = ["System", "User"]
 
@@ -203,6 +211,7 @@ def load_arguments(self, _):
                    validator=validate_load_balancer_idle_timeout)
         c.argument('outbound_type', arg_type=get_enum_type([CONST_OUTBOUND_TYPE_LOAD_BALANCER,
                                                             CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING]))
+        c.argument('auto_upgrade_channel', arg_type=get_enum_type(auto_upgrade_channels))
         c.argument('enable_cluster_autoscaler', action='store_true')
         c.argument('cluster_autoscaler_profile', nargs='+', options_list=["--cluster-autoscaler-profile", "--ca-profile"], validator=validate_cluster_autoscaler_profile,
                    help="Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.")
@@ -297,6 +306,7 @@ def load_arguments(self, _):
                    validator=validate_load_balancer_outbound_ports)
         c.argument('load_balancer_idle_timeout', type=int,
                    validator=validate_load_balancer_idle_timeout)
+        c.argument('auto_upgrade_channel', arg_type=get_enum_type(auto_upgrade_channels))
         c.argument('api_server_authorized_ip_ranges',
                    type=str, validator=validate_ip_ranges)
         c.argument('enable_ahub', options_list=['--enable-ahub'])

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

@@ -2036,6 +2036,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
                load_balancer_outbound_ports=None,
                load_balancer_idle_timeout=None,
                outbound_type=None,
+               auto_upgrade_channel=None,
                enable_addons=None,
                workspace_resource_id=None,
                vnet_subnet_id=None,
@@ -2076,6 +2077,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
                no_wait=False,
                yes=False,
                enable_azure_rbac=False):
+    auto_upgrade_profile = None
     ManagedClusterWindowsProfile = cmd.get_models('ManagedClusterWindowsProfile',
                                                   resource_type=ResourceType.MGMT_CONTAINERSERVICE,
                                                   operation_group='managed_clusters')
@@ -2100,6 +2102,9 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
     ManagedClusterAADProfile = cmd.get_models('ManagedClusterAADProfile',
                                               resource_type=ResourceType.MGMT_CONTAINERSERVICE,
                                               operation_group='managed_clusters')
+    ManagedClusterAutoUpgradeProfile = cmd.get_models('ManagedClusterAutoUpgradeProfile',
+                                                      resource_type=ResourceType.MGMT_CONTAINERSERVICE,
+                                                      operation_group='managed_clusters')
     ManagedClusterAgentPoolProfile = cmd.get_models('ManagedClusterAgentPoolProfile',
                                                     resource_type=ResourceType.MGMT_CONTAINERSERVICE,
                                                     operation_group='managed_clusters')
@@ -2430,6 +2435,9 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
             cluster_identity_object_id,
             assign_kubelet_identity)
 
+    if auto_upgrade_channel is not None:
+        auto_upgrade_profile = ManagedClusterAutoUpgradeProfile(upgrade_channel=auto_upgrade_channel)
+
     mc = ManagedCluster(
         location=location,
         tags=tags,
@@ -2447,7 +2455,8 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
         api_server_access_profile=api_server_access_profile,
         identity=identity,
         disk_encryption_set_id=node_osdisk_diskencryptionset_id,
-        identity_profile=identity_profile
+        identity_profile=identity_profile,
+        auto_upgrade_profile=auto_upgrade_profile
     )
 
     if disable_public_fqdn:
@@ -2771,6 +2780,7 @@ def aks_update(cmd, client, resource_group_name, name,
                enable_ahub=False,
                disable_ahub=False,
                windows_admin_password=None,
+               auto_upgrade_channel=None,
                enable_managed_identity=False,
                assign_identity=None,
                yes=False,
@@ -2785,6 +2795,9 @@ def aks_update(cmd, client, resource_group_name, name,
     ManagedClusterAADProfile = cmd.get_models('ManagedClusterAADProfile',
                                               resource_type=ResourceType.MGMT_CONTAINERSERVICE,
                                               operation_group='managed_clusters')
+    ManagedClusterAutoUpgradeProfile = cmd.get_models('ManagedClusterAutoUpgradeProfile',
+                                                      resource_type=ResourceType.MGMT_CONTAINERSERVICE,
+                                                      operation_group='managed_clusters')
     ManagedClusterIdentity = cmd.get_models('ManagedClusterIdentity',
                                             resource_type=ResourceType.MGMT_CONTAINERSERVICE,
                                             operation_group='managed_clusters')
@@ -2814,6 +2827,7 @@ def aks_update(cmd, client, resource_group_name, name,
             not update_aad_profile and
             not enable_ahub and
             not disable_ahub and
+            not auto_upgrade_channel and
             not windows_admin_password and
             not enable_managed_identity and
             not assign_identity and
@@ -2828,6 +2842,7 @@ def aks_update(cmd, client, resource_group_name, name,
                        '"--load-balancer-outbound-ip-prefixes" or'
                        '"--load-balancer-outbound-ports" or'
                        '"--load-balancer-idle-timeout" or'
+                       '"--auto-upgrade-channel" or '
                        '"--attach-acr" or "--detach-acr" or'
                        '"--uptime-sla" or'
                        '"--no-uptime-sla" or '
@@ -2991,6 +3006,11 @@ def aks_update(cmd, client, resource_group_name, name,
     if disable_ahub:
         instance.windows_profile.license_type = 'None'
 
+    if auto_upgrade_channel is not None:
+        if instance.auto_upgrade_profile is None:
+            instance.auto_upgrade_profile = ManagedClusterAutoUpgradeProfile()
+        instance.auto_upgrade_profile.upgrade_channel = auto_upgrade_channel
+
     if enable_public_fqdn and disable_public_fqdn:
         raise MutuallyExclusiveArgumentError(
             'Cannot specify "--enable-public-fqdn" and "--disable-public-fqdn" at the same time')