[AKS Fleet] - Add support for UpgradeStrategy, Default Hubless, and NodeImageSelection

src/fleet/HISTORY.rst

@@ -31,3 +31,14 @@ Release History
 0.2.4
 ++++++
 * Added support for private fleet & MSI.
+
+0.2.5
+++++++
+* Upgrade SDK version to 2023-08-15-preview
+
+0.2.6
+++++++
+* By default, fleets are now created without a hub
+* Added support for Fleet Upgrade Strategy
+* Added argument for Node Image Selection.
+

src/fleet/azext_fleet/__init__.py

@@ -15,7 +15,7 @@ def register_fleet_resource_type():
     register_resource_type(
         "latest",
         CUSTOM_MGMT_FLEET,
-        SDKProfile("2023-06-15-preview"),
+        SDKProfile("2023-08-15-preview"),
     )
 
 

src/fleet/azext_fleet/_client_factory.py

@@ -29,6 +29,10 @@ def cf_update_runs(cli_ctx, *_):
     return get_container_service_client(cli_ctx).update_runs
 
 
+def cf_fleet_update_strategies(cli_ctx, *_):
+    return get_container_service_client(cli_ctx).fleet_update_strategies
+
+
 def get_resource_groups_client(cli_ctx, subscription_id=None):
     return get_mgmt_service_client(
         cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, subscription_id=subscription_id).resource_groups

src/fleet/azext_fleet/_help.py

@@ -134,12 +134,12 @@
           short-summary: Path to a json file that defines stages to upgrade a fleet. See examples for further reference.
     examples:
         - name: Create updaterun for a fleet with 'Full' upgrade type.
-          text: az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type Full --kubernetes-version 1.25.0
+          text: az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type Full --kubernetes-version 1.25.0 --node-image-selection Latest
         - name: Create updaterun for a fleet with 'NodeImageOnly' upgrade type.
-          text: az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type NodeImageOnly
+          text: az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type NodeImageOnly --node-image-selection Latest
         - name: Create updaterun for a fleet with 'Full' upgrade type & stages.
           text: |
-            az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type Full --kubernetes-version 1.25.0 --stages ./test/stages.json
+            az fleet updaterun create -g MyResourceGroup -f MyFleet -n MyUpdateRun --upgrade-type Full --kubernetes-version 1.25.0 --node-image-selection Latest --stages ./test/stages.json
 
                 A sample json to demonstrate the expected format. It takes a stages array. Each stage consists of the stage name, groups array and an optional afterStageWaitInSeconds integer.
                 Within groups, each group consists of group name, given to a fleet's member(s).
@@ -202,3 +202,44 @@
     type: command
     short-summary: Stops a fleet update run.
 """
+
+helps['fleet updaterun wait'] = """
+    type: command
+    short-summary: Wait for a fleet updateraun resource to reach a desired state.
+    long-summary: If an operation on fleet updateraun was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
+"""
+
+helps['fleet updatestrategy'] = """
+    type: group
+    short-summary: Commands to manage a fleet update strategy.
+"""
+
+helps['fleet updatestrategy create'] = """
+    type: command
+    short-summary: Creates or updates a update strategy
+    parameters:
+        - name: --stages
+          type: string
+          short-summary: Path to a json file that defines the update strategy.
+"""
+
+helps['fleet updatestrategy show'] = """
+    type: command
+    short-summary: Shows a update strategy.
+"""
+
+helps['fleet updatestrategy list'] = """
+    type: command
+    short-summary: Lists the fleet's update strategies.
+"""
+
+helps['fleet updatestrategy delete'] = """
+    type: command
+    short-summary: Deletes a update strategy.
+"""
+
+helps['fleet updatestrategy wait'] = """
+    type: command
+    short-summary: Wait for a fleet updatestrategy resource to reach a desired state.
+    long-summary: If an operation on fleet updatestrategy was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
+"""

src/fleet/azext_fleet/_params.py

@@ -9,12 +9,10 @@
     tags_type,
     file_type,
     get_location_type,
-    get_three_state_flag
+    get_enum_type
 )
 from azure.cli.core.commands.validators import get_default_location_from_resource_group
-
-from azext_fleet._validators import validate_member_cluster_id, validate_upgrade_type, validate_kubernetes_version
-from azext_fleet._validators import validate_member_cluster_id, validate_upgrade_type, validate_kubernetes_version, validate_apiserver_subnet_id, validate_agent_subnet_id, validate_assign_identity
+from azext_fleet._validators import validate_member_cluster_id, validate_kubernetes_version, validate_apiserver_subnet_id, validate_agent_subnet_id, validate_assign_identity, validate_update_strategy_id
 
 
 def load_arguments(self, _):
@@ -26,16 +24,17 @@ def load_arguments(self, _):
     with self.argument_context('fleet create') as c:
         c.argument('tags', tags_type)
         c.argument('dns_name_prefix', options_list=['--dns-name-prefix', '-p'])
-        c.argument('enable_private_cluster', arg_type=get_three_state_flag(), is_preview=True, help='Whether to create the Fleet hub as a private cluster or not.')
-        c.argument('enable_vnet_integration', arg_type=get_three_state_flag(), is_preview=True, help='Whether to enable apiserver vnet integration for the Fleet hub or not.')
+        c.argument('enable_private_cluster', action='store_true', is_preview=True, help='Whether to create the Fleet hub as a private cluster or not.')
+        c.argument('enable_vnet_integration', action='store_true', is_preview=True, help='Whether to enable apiserver vnet integration for the Fleet hub or not.')
         c.argument('apiserver_subnet_id', validator=validate_apiserver_subnet_id, is_preview=True, help='The subnet to be used when apiserver vnet integration is enabled. It is required when creating a new Fleet with BYO vnet.')
         c.argument('agent_subnet_id', validator=validate_agent_subnet_id, is_preview=True, help='The ID of the subnet which the Fleet hub node will join on startup. If this is not specified, a vnet and subnet will be generated and used.')
-        c.argument('enable_managed_identity', arg_type=get_three_state_flag(), is_preview=True, help='Enable system assigned managed identity (MSI) on the Fleet resource.')
+        c.argument('enable_managed_identity', action='store_true', is_preview=True, help='Enable system assigned managed identity (MSI) on the Fleet resource.')
         c.argument('assign_identity', validator=validate_assign_identity, is_preview=True, help='With --enable-managed-identity, enable user assigned managed identity (MSI) on the Fleet resource. Specify the existing user assigned identity resource.')
+        c.argument('enable_hub', action='store_true', is_preview=True, help='If set, the Fleet will be created with a hub cluster.')
 
     with self.argument_context('fleet update') as c:
         c.argument('tags', tags_type)
-        c.argument('enable_managed_identity', arg_type=get_three_state_flag(), is_preview=True, help='Enable system assigned managed identity (MSI) on the Fleet resource.')
+        c.argument('enable_managed_identity', action='store_true', is_preview=True, help='Enable system assigned managed identity (MSI) on the Fleet resource.')
         c.argument('assign_identity', validator=validate_assign_identity, is_preview=True, help='With --enable-managed-identity, enable user assigned managed identity (MSI) on the Fleet resource. Specify the existing user assigned identity resource.')
 
     with self.argument_context('fleet get-credentials') as c:
@@ -58,22 +57,15 @@ def load_arguments(self, _):
         c.argument('fleet_name', options_list=['--fleet-name', '-f'], help='Specify the fleet name.')
 
     with self.argument_context('fleet updaterun create') as c:
-        c.argument('upgrade_type', validator=validate_upgrade_type)
+        c.argument('upgrade_type', arg_type=get_enum_type(['Full', 'NodeImageOnly']))
         c.argument('kubernetes_version', validator=validate_kubernetes_version)
-        c.argument('stages', type=file_type, completer=FilesCompleter())
-        c.argument('update_group')
-
-    with self.argument_context('fleet member update') as c:
-        c.argument('update_group')
-
-    with self.argument_context('fleet member update') as c:
-        c.argument('update_group')
+        c.argument('node_image_selection', arg_type=get_enum_type(['Latest', 'Consistent']), help='Node Image Selection is an option that lets you choose how your clusters\' nodes are upgraded')
+        c.argument('stages', type=file_type, completer=FilesCompleter(), help='Path to a json file that defines stages to upgrade a fleet. See examples for further reference.')
+        c.argument('update_strategy_id', validator=validate_update_strategy_id, help='The ID of the update strategy to use for this update run. If not specified, the default update strategy will be used.')
 
-    with self.argument_context('fleet updaterun') as c:
-        c.argument('name', options_list=['--name', '-n'], help='Specify name for the update run.')
+    with self.argument_context('fleet updatestrategy') as c:
+        c.argument('name', options_list=['--name', '-n'], help='Specify name for the fleet update strategy.')
         c.argument('fleet_name', options_list=['--fleet-name', '-f'], help='Specify the fleet name.')
 
-    with self.argument_context('fleet updaterun create') as c:
-        c.argument('upgrade_type', validator=validate_upgrade_type)
-        c.argument('kubernetes_version', validator=validate_kubernetes_version)
-        c.argument('stages', type=file_type, completer=FilesCompleter())
+    with self.argument_context('fleet updatestrategy create') as c:
+        c.argument('stages', type=file_type, completer=FilesCompleter(), help='Path to a json file that defines an update strategy.')

src/fleet/azext_fleet/_validators.py

@@ -17,13 +17,6 @@ def validate_member_cluster_id(namespace):
             "--member-cluster-id is not a valid Azure resource ID.")
 
 
-def validate_upgrade_type(namespace):
-    upgrade_type = namespace.upgrade_type
-    if upgrade_type not in ("Full", "NodeImageOnly"):
-        raise InvalidArgumentValueError(
-            "--upgrade-type must be set to 'Full' or 'NodeImageOnly'")
-
-
 def validate_kubernetes_version(namespace):
     try:
         if namespace.kubernetes_version:
@@ -41,6 +34,14 @@ def validate_agent_subnet_id(namespace):
     _validate_subnet_id(namespace.agent_subnet_id, "--agent-subnet-id")
 
 
+def validate_update_strategy_id(namespace):
+    if namespace.update_strategy_id is not None:
+        from msrestazure.tools import is_valid_resource_id
+        if not is_valid_resource_id(namespace.update_strategy_id):
+            raise CLIError(
+                "--update-strategy-id is not a valid Azure resource ID.")
+
+
 def _validate_subnet_id(subnet_id, name):
     if subnet_id is None or subnet_id == '':
         return

src/fleet/azext_fleet/commands.py

@@ -5,7 +5,7 @@
 
 # pylint: disable=line-too-long
 from azure.cli.core.commands import CliCommandType
-from azext_fleet._client_factory import cf_fleets, cf_fleet_members, cf_update_runs
+from azext_fleet._client_factory import cf_fleets, cf_fleet_members, cf_update_runs, cf_fleet_update_strategies
 
 
 def load_command_table(self, _):
@@ -28,10 +28,16 @@ def load_command_table(self, _):
         client_factory=cf_update_runs
     )
 
+    fleet_update_strategy_sdk = CliCommandType(
+        operations_tmpl="azext_fleet.vendored_sdks.operations._fleet_update_strategies_operations#FleetUpdateStrategiesOperations.{}",
+        operation_group="fleet_update_strategies",
+        client_factory=cf_fleet_update_strategies
+    )
+
     # fleets command group
     with self.command_group("fleet", fleets_sdk, client_factory=cf_fleets, is_preview=True) as g:
         g.custom_command("create", "create_fleet", supports_no_wait=True)
-        g.custom_command("update", "update_fleet")
+        g.custom_command("update", "update_fleet", supports_no_wait=True)
         g.custom_show_command("show", "show_fleet")
         g.custom_command("list", "list_fleet")
         g.custom_command("delete", "delete_fleet", supports_no_wait=True)
@@ -55,3 +61,12 @@ def load_command_table(self, _):
         g.custom_command("delete", "delete_update_run", supports_no_wait=True)
         g.custom_command("start", "start_update_run", supports_no_wait=True)
         g.custom_command("stop", "stop_update_run", supports_no_wait=True)
+        g.wait_command("wait")
+
+    # fleet update strategies command group
+    with self.command_group("fleet updatestrategy", fleet_update_strategy_sdk, client_factory=cf_fleet_update_strategies) as g:
+        g.custom_command("create", "create_fleet_update_strategy", supports_no_wait=True)
+        g.custom_show_command("show", "show_fleet_update_strategy")
+        g.custom_command("list", "list_fleet_update_strategies")
+        g.custom_command("delete", "delete_fleet_update_strategy", supports_no_wait=True)
+        g.wait_command("wait")