Merge upstream/main and resolve HISTORY.rst conflict

Author: Wen Huang

.github/policies/resourceManagement.yml

@@ -2365,17 +2365,6 @@ configuration:
             - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
-      - if:
-        - hasLabel:
-            label: Service Attention
-        - hasLabel:
-            label: Neon Postgre
-        then:
-        - mentionUsers:
-            mentionees:
-            - alluri02
-            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
-            assignMentionees: False
       - if:
         - hasLabel:
             label: Service Attention

linter_exclusions.yml

@@ -3588,46 +3588,6 @@ eventgrid namespace topic update:
       rule_exclusions:
       - option_length_too_long
 
-neon postgres endpoint create:
-  rule_exclusions:
-  - missing_command_example
-
-neon postgres neon-role create:
-  rule_exclusions:
-  - missing_command_example
-
-neon postgres neon-database create:
-  rule_exclusions:
-  - missing_command_example
-
-neon postgres get-postgres-version:
-  rule_exclusions:
-  - missing_command_example
-
-neon postgres branch:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
-neon postgres endpoint:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
-neon postgres neon-database:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
-neon postgres neon-role:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
-neon postgres organization:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
-neon postgres project:
-  rule_exclusions:
-  - require_wait_command_if_no_wait
-
 confcom containers from_vn2:
   parameters:
     template:

src/aks-preview/HISTORY.rst

@@ -12,6 +12,18 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 * `az aks nodepool update`: Support `--node-vm-size` to resize VM size of an existing VMSS-based agent pool (preview). Requires AFEC registration `Microsoft.ContainerService/AgentPoolVMSSResize`.
+* `az aks nodepool update`: clean up some useless code in the update managed gpu function.
+* `az aks machine add`: Add `--spot-max-price` flag support to set the max price (in US Dollars) you are willing to pay for spot instances on a machine.
+* `az aks machine add`: Add `--eviction-policy` flag support to set the eviction policy for a machine.
+* `az aks machine add`: Add `--enable-ultra-ssd` flag support to enable ultra ssd on a machine.
+
+20.0.0b1
++++++++
+* [Breaking Change] `az aks create/update`: Change `--nat-gateway-outbound-ips` and `--nat-gateway-outbound-ip-prefixes` to use comma-separated values, consistent with load balancer outbound IP parameters.
+
+19.0.0b30
++++++++
+* Add option `AzureContainerLinux` to `--os-sku` for `az aks create`, `az aks nodepool add`, and `az aks nodepool update`.
 
 19.0.0b29
 +++++++

src/aks-preview/azext_aks_preview/_consts.py

@@ -45,6 +45,7 @@
 CONST_OS_SKU_UBUNTU2404 = "Ubuntu2404"
 CONST_OS_SKU_AZURELINUXOSGUARD = "AzureLinuxOSGuard"
 CONST_OS_SKU_AZURELINUX3OSGUARD = "AzureLinux3OSGuard"
+CONST_OS_SKU_AZURECONTAINERLINUX = "AzureContainerLinux"
 
 # vm set type
 CONST_VIRTUAL_MACHINE_SCALE_SETS = "VirtualMachineScaleSets"

src/aks-preview/azext_aks_preview/_help.py

@@ -279,7 +279,7 @@
           short-summary: The ID of a PPG.
         - name: --os-sku
           type: string
-          short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, or Flatcar when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
+          short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
         - name: --enable-fips-image
           type: bool
           short-summary: Use FIPS-enabled OS on agent nodes.
@@ -2112,7 +2112,7 @@
           short-summary: The OS Type. Linux or Windows. Windows not supported yet for "VirtualMachines" VM set type.
         - name: --os-sku
           type: string
-          short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, or Flatcar when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
+          short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
         - name: --enable-fips-image
           type: bool
           short-summary: Use FIPS-enabled OS on agent nodes.
@@ -2733,6 +2733,15 @@
        - name: --node-public-ip-tags
          type: string
          short-summary: The ipTags of the machine public IPs.
+       - name: --spot-max-price
+         type: number
+         short-summary: The max price (in US Dollars) you are willing to pay for spot instances.
+       - name: --enable-ultra-ssd
+         type: bool
+         short-summary: Whether to enable UltraSSD.
+       - name: --eviction-policy
+         type: string
+         short-summary: The eviction policy for machine. This cannot be specified unless the priority is 'Spot'. If not specified, the default is 'Delete'.
 """
 
 helps['aks machine update'] = """

src/aks-preview/azext_aks_preview/_natgateway.py

@@ -91,14 +91,16 @@ def configure_nat_gateway_profile(
 
     if outbound_ip_ids is not None:
         ManagedClusterNATGatewayProfileOutboundIPs = models.ManagedClusterNATGatewayProfileOutboundIPs
+        ip_id_list = [x.strip() for x in outbound_ip_ids.split(',') if x.strip()]
         profile.outbound_i_ps = ManagedClusterNATGatewayProfileOutboundIPs(
-            public_i_ps=outbound_ip_ids
+            public_i_ps=ip_id_list
         )
 
     if outbound_ip_prefix_ids is not None:
         ManagedClusterNATGatewayProfileOutboundIPPrefixes = models.ManagedClusterNATGatewayProfileOutboundIPPrefixes
+        prefix_id_list = [x.strip() for x in outbound_ip_prefix_ids.split(',') if x.strip()]
         profile.outbound_ip_prefixes = ManagedClusterNATGatewayProfileOutboundIPPrefixes(
-            public_ip_prefixes=outbound_ip_prefix_ids
+            public_ip_prefixes=prefix_id_list
         )
 
     return profile

src/aks-preview/azext_aks_preview/_params.py

@@ -102,6 +102,7 @@
     CONST_OS_SKU_MARINER,
     CONST_OS_SKU_AZURELINUXOSGUARD,
     CONST_OS_SKU_AZURELINUX3OSGUARD,
+    CONST_OS_SKU_AZURECONTAINERLINUX,
     CONST_OS_SKU_UBUNTU,
     CONST_OS_SKU_UBUNTU2204,
     CONST_OS_SKU_UBUNTU2404,
@@ -302,6 +303,7 @@
     CONST_OS_SKU_UBUNTU2404,
     CONST_OS_SKU_AZURELINUXOSGUARD,
     CONST_OS_SKU_AZURELINUX3OSGUARD,
+    CONST_OS_SKU_AZURECONTAINERLINUX,
 ]
 node_os_skus_add = node_os_skus_create + [
     CONST_OS_SKU_WINDOWS2019,
@@ -318,6 +320,7 @@
     CONST_OS_SKU_UBUNTU2404,
     CONST_OS_SKU_AZURELINUXOSGUARD,
     CONST_OS_SKU_AZURELINUX3OSGUARD,
+    CONST_OS_SKU_AZURECONTAINERLINUX,
 ]
 scale_down_modes = [CONST_SCALE_DOWN_MODE_DELETE, CONST_SCALE_DOWN_MODE_DEALLOCATE]
 workload_runtimes = [
@@ -691,8 +694,7 @@ def load_arguments(self, _):
                 "--nat-gateway-outbound-ips",
                 "--nat-gw-ips",
             ],
-            nargs="+",
-            help="Space-separated public IP resource IDs for the "
+            help="Comma-separated public IP resource IDs for the "
                  "cluster NAT gateway. V2 only.",
         )
         c.argument(
@@ -701,8 +703,7 @@ def load_arguments(self, _):
                 "--nat-gateway-outbound-ip-prefixes",
                 "--nat-gw-prefixes",
             ],
-            nargs="+",
-            help="Space-separated public IP prefix resource IDs "
+            help="Comma-separated public IP prefix resource IDs "
                  "for the cluster NAT gateway. V2 only.",
         )
         c.argument(
@@ -1329,8 +1330,7 @@ def load_arguments(self, _):
                 "--nat-gateway-outbound-ips",
                 "--nat-gw-ips",
             ],
-            nargs="+",
-            help="Space-separated public IP resource IDs for the "
+            help="Comma-separated public IP resource IDs for the "
                  "cluster NAT gateway. V2 only.",
         )
         c.argument(
@@ -1339,8 +1339,7 @@ def load_arguments(self, _):
                 "--nat-gateway-outbound-ip-prefixes",
                 "--nat-gw-prefixes",
             ],
-            nargs="+",
-            help="Space-separated public IP prefix resource IDs "
+            help="Comma-separated public IP prefix resource IDs "
                  "for the cluster NAT gateway. V2 only.",
         )
         c.argument("network_dataplane", arg_type=get_enum_type(network_dataplanes))
@@ -2440,6 +2439,21 @@ def load_arguments(self, _):
             validator=validate_k8s_version,
             help="Version of Kubernetes to use for the machine.",
         )
+        c.argument(
+            "spot_max_price",
+            type=float,
+            validator=validate_spot_max_price,
+            help="The max price (in US Dollars) you are willing to pay for spot instances."
+        )
+        c.argument(
+            "enable_ultra_ssd",
+            action="store_true"
+        )
+        c.argument(
+            "eviction_policy",
+            arg_type=get_enum_type(node_eviction_policies),
+            validator=validate_eviction_policy,
+        )
 
     with self.argument_context("aks machine update") as c:
         c.argument(

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -1826,16 +1826,10 @@ def update_managed_gpu(self, agentpool: AgentPool) -> AgentPool:
                 agentpool.gpu_profile = self.models.GPUProfile()  # pylint: disable=no-member
             if agentpool.gpu_profile.nvidia is None:
                 agentpool.gpu_profile.nvidia = self.models.NvidiaGPUProfile()  # pylint: disable=no-member
-            # Check if already set to the desired value to avoid API error
-            if agentpool.gpu_profile.nvidia.management_mode == CONST_GPU_MANAGEMENT_MODE_MANAGED:
-                return agentpool
             agentpool.gpu_profile.nvidia.management_mode = CONST_GPU_MANAGEMENT_MODE_MANAGED
             agentpool.gpu_profile.driver = CONST_GPU_DRIVER_INSTALL
         else:
             if agentpool.gpu_profile and agentpool.gpu_profile.nvidia:
-                # Check if already set to the desired value to avoid API error
-                if agentpool.gpu_profile.nvidia.management_mode == CONST_GPU_MANAGEMENT_MODE_UNMANAGED:
-                    return agentpool
                 agentpool.gpu_profile.nvidia.management_mode = CONST_GPU_MANAGEMENT_MODE_UNMANAGED
 
         return agentpool

src/aks-preview/azext_aks_preview/custom.py

@@ -15,6 +15,7 @@
 import time
 import webbrowser
 import subprocess
+from math import isnan
 
 from azext_aks_preview._client_factory import (
     CUSTOM_MGMT_AKS_PREVIEW,
@@ -2761,6 +2762,9 @@ def aks_machine_add(
     vm_size=None,
     kubernetes_version=None,
     no_wait=False,
+    spot_max_price=float("nan"),
+    enable_ultra_ssd=False,
+    eviction_policy=None,
 ):
     existedMachine = None
     try:
@@ -2773,6 +2777,9 @@ def aks_machine_add(
             f"Machine '{machine_name}' already exists. Please use 'az aks machine update' to update it."
         )
 
+    if isnan(spot_max_price):
+        spot_max_price = -1
+
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()
     return add_machine(cmd, client, raw_parameters, no_wait)

src/aks-preview/azext_aks_preview/machine.py

@@ -84,14 +84,18 @@ def constructMachine(cmd, raw_parameters, machine_name):
     )
     tags = raw_parameters.get("tags")
     priority = raw_parameters.get("priority")
+    eviction_policy = raw_parameters.get("eviction_policy")
     machineProperties = MachineProperties(
         tags=tags,
         priority=priority,
+        eviction_policy=eviction_policy,
         network=set_machine_network(cmd, raw_parameters),
         hardware=set_machine_hardware_profile(cmd, raw_parameters),
         kubernetes=set_machine_kubernetes_profile(cmd, raw_parameters),
-        operating_system=set_machine_os_profile(cmd, raw_parameters)
+        operating_system=set_machine_os_profile(cmd, raw_parameters),
+        billing=set_machine_billing_profile(cmd, raw_parameters)
     )
+
     Machine = cmd.get_models(
         "Machine",
         resource_type=CUSTOM_MGMT_AKS_PREVIEW,
@@ -106,6 +110,7 @@ def constructMachine(cmd, raw_parameters, machine_name):
 
 
 def set_machine_hardware_profile(cmd, raw_parameters):
+    enable_ultra_ssd = raw_parameters.get("enable_ultra_ssd")
     vm_size = raw_parameters.get("vm_size")
     if vm_size is None:
         raise RequiredArgumentMissingError(
@@ -117,7 +122,8 @@ def set_machine_hardware_profile(cmd, raw_parameters):
         operation_group="machines"
     )
     machine_hardware_profile = MachineHardwareProfile(
-        vm_size=vm_size
+        vm_size=vm_size,
+        ultra_ssd_enabled=enable_ultra_ssd
     )
     return machine_hardware_profile
 
@@ -196,3 +202,16 @@ def set_machine_os_profile(cmd, raw_parameters):
         enable_fips=enable_fips
     )
     return machineOSProfile
+
+
+def set_machine_billing_profile(cmd, raw_parameters):
+    spot_max_price = raw_parameters.get("spot_max_price")
+    MachineBillingProfile = cmd.get_models(
+        "MachineBillingProfile",
+        resource_type=CUSTOM_MGMT_AKS_PREVIEW,
+        operation_group="machines"
+    )
+    machineBillingProfile = MachineBillingProfile(
+        spot_max_price=spot_max_price
+    )
+    return machineBillingProfile