Merge remote-tracking branch 'upstream/main'

Author: jonathanhe-msft

.githooks/pre-commit

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-commit.ps1; else sh .githooks/pre-commit.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-commit.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-commit.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-commit.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-commit.sh..."
+    sh .githooks/pre-commit.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-push.ps1; else sh .githooks/pre-push.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-push.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-push.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-push.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-push.sh..."
+    sh .githooks/pre-push.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push.ps1

@@ -66,8 +66,10 @@ if ($AZURE_CLI_FOLDER) {
         Write-Host "Would you like to automatically rebase and setup? [Y/n]" -ForegroundColor Yellow
 
         try {
-            $reader = [System.IO.StreamReader]::new("CON")
-            $input = $reader.ReadLine()
+            $input = Read-Host
+            if ([string]::IsNullOrEmpty($input)) {
+                $input = "Y"
+            }
         } catch {
             Write-Host "Error reading input. Aborting push..." -ForegroundColor Red
             exit 1

linter_exclusions.yml

@@ -207,6 +207,11 @@ aks update:
     cluster_service_load_balancer_health_probe_mode:
       rule_exclusions:
       - option_length_too_long
+arcdata dc config init:
+  parameters:
+    path:
+      rule_exclusions:
+      - disallowed_html_tag_from_parameter
 arcdata dc create:
   parameters:
     logs_ui_private_key_file:
@@ -221,6 +226,12 @@ arcdata dc create:
     metrics_ui_public_key_file:
       rule_exclusions:
       - option_length_too_long
+arcdata dc:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+arcdata ad-connector:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
 arcdata ad-connector create:
   parameters:
     domain_service_account_secret:
@@ -237,6 +248,17 @@ arcdata ad-connector update:
     secondary_domain_controllers:
       rule_exclusions:
       - option_length_too_long
+sql instance-failover-group-arc:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+sql instance-failover-group-arc create:
+  parameters:
+    partner_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+sql server-arc availability-group:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
 sql server-arc availability-group create:
   parameters:
     automated_backup_preference:
@@ -268,6 +290,9 @@ sql mi-arc update:
     tde_protector_public_key_file:
       rule_exclusions:
       - option_length_too_long
+sql mi-arc:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
 sql mi-arc create:
   parameters:
     sync_secondary_to_commit:

scripts/ci/avail-ext-doc/list-template.md

@@ -5,12 +5,9 @@ author: haroldrandom
 ms.author: jianzen
 manager: yonzhan,yungezz
 ms.date: {{ date }}
-ms.topic: article
+ms.topic: generated-reference
 ms.service: azure-cli
-ms.devlang: azure-cli
-ms.tool: azure-cli
 ms.custom: devx-track-azurecli
-keywords: az extension, azure cli extensions, azure extensions
 ---
 
 # Available Azure CLI extensions

src/aks-preview/HISTORY.rst

@@ -9,16 +9,37 @@ If there is no rush to release a new version, please just add a description of t
 
 To release a new version, please select a new version number (usually plus 1 to last patch version, X.Y.Z -> Major.Minor.Patch, more details in `\doc <https://semver.org/>`_), and then add a new section named as the new version number in this file, the content should include the new modifications and everything from the *Pending* section. Finally, update the `VERSION` variable in `setup.py` with this new version number.
 
+Pending
++++++++
+* Vendor new SDK and bump API version to 2024-10-02-preview.
+
+13.0.0b8
++++++++
+* `az aks create/update``: Update recording rule group create logic for managed prometheus addon
+
+13.0.0b7
++++++++
+* Add `--max-unavailable` to the `az aks nodepool add/update/upgrade` commands.
+
+13.0.0b6
++++++++
+* `az aks create/update`: Update parameter description of `--custom-ca-certificates`.
+
+13.0.0b5
++++++++
+* `az aks create/az aks nodepool add`: Emit error message when using `--asg-ids` alone without `--allowed-host-ports`.
+
+13.0.0b4
++++++++
+* `az aks nodepool upgrade`: Fix `--node-soak-duration` cannot be specified as 0
+
 13.0.0b3
 +++++++
 * `az aks create`: Update outbound type selection logic for automatic cluster when customer brings BYO Vnet.
 
 13.0.0b2
 +++++++
 * `az aks create/update`: Update advanced container networking service (acns) with 2024-09-02-preview API version enablement.
-
-Pending
-+++++++
 * Vendor new SDK and bump API version to 2024-09-02-preview.
 
 13.0.0b1

src/aks-preview/README.rst

@@ -181,6 +181,9 @@ Released version and adopted API version
     * - 9.0.0b2 ~ 13.0.0b1
       - 2024-07-02-preview
       - 
-    * - 13.0.0b2 ~ latest
+    * - 13.0.0b2 ~ 13.0.0b7
       - 2024-09-02-preview
       - 
+    * - 13.0.0b8 ~ latest
+      - 2024-10-02-preview
+      - 

src/aks-preview/azext_aks_preview/__init__.py

@@ -16,7 +16,7 @@ def register_aks_preview_resource_type():
     register_resource_type(
         "latest",
         CUSTOM_MGMT_AKS_PREVIEW,
-        SDKProfile("2024-09-02-preview", {"container_services": "2017-07-01"}),
+        SDKProfile("2024-10-02-preview", {"container_services": "2017-07-01"}),
     )
 
 

src/aks-preview/azext_aks_preview/_help.py

@@ -515,7 +515,7 @@
         - name: --ca-certs --custom-ca-trust-certificates
           type: string
           short-summary: Path to a file containing up to 10 blank line separated certificates. Only valid for linux nodes.
-          long-summary: These certificates are used by Custom CA Trust features and will be added to trust stores of nodes. Requires Custom CA Trust to be enabled on the node.
+          long-summary: These certificates are used by Custom CA Trust features and will be added to trust stores of nodes.
         - name: --enable-keda
           type: bool
           short-summary: Enable KEDA workload auto-scaler.
@@ -1186,7 +1186,7 @@
         - name: --ca-certs --custom-ca-trust-certificates
           type: string
           short-summary: Path to a file containing up to 10 blank line separated certificates. Only valid for linux nodes.
-          long-summary: These certificates are used by Custom CA Trust features and will be added to trust stores of nodes. Requires Custom CA Trust to be enabled on the node.
+          long-summary: These certificates are used by Custom CA Trust features and will be added to trust stores of nodes.
         - name: --safeguards-level
           type: string
           short-summary: The deployment safeguards Level. Accepted Values are [Off, Warning, Enforcement]. Requires azure policy addon to be enabled
@@ -1775,6 +1775,9 @@
         - name: --node-soak-duration
           type: int
           short-summary: The amount of time (in minutes) to wait after draining a node and before reimaging it and moving on to next node.
+        - name: --max-unavailable
+          type: string
+          short-summary: The maximum number or percentage of nodes that can be simultaneously unavailable during upgrade. When specified, it represents the number or percent used, eg. 1 or 5%
         - name: --kubelet-config
           type: string
           short-summary: Kubelet configurations for agent nodes.
@@ -1911,6 +1914,9 @@
         - name: --node-soak-duration
           type: int
           short-summary: The amount of time (in minutes) to wait after draining a node and before reimaging it and moving on to next node.
+        - name: --max-unavailable
+          type: string
+          short-summary: The maximum number or percentage of nodes that can be simultaneously unavailable during upgrade. When specified, it represents the number or percent used, eg. 1 or 5%
         - name: --aks-custom-headers
           type: string
           short-summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2
@@ -1960,6 +1966,9 @@
         - name: --node-soak-duration
           type: int
           short-summary: The amount of time (in minutes) to wait after draining a node and before reimaging it and moving on to next node.
+        - name: --max-unavailable
+          type: string
+          short-summary: The maximum number or percentage of nodes that can be simultaneously unavailable during upgrade. When specified, it represents the number or percent used, eg. 1 or 5%
         - name: --mode
           type: string
           short-summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.

src/aks-preview/azext_aks_preview/_params.py

@@ -194,6 +194,7 @@
     validate_custom_endpoints,
     validate_bootstrap_container_registry_resource_id,
     validate_gateway_prefix_size,
+    validate_max_unavailable,
 )
 from azext_aks_preview.azurecontainerstorage._consts import (
     CONST_ACSTOR_ALL,
@@ -1469,6 +1470,7 @@ def load_arguments(self, _):
         c.argument("drain_timeout", type=int)
         c.argument("node_soak_duration", type=int)
         c.argument("undrainable_node_behavior")
+        c.argument("max_unavailable", validator=validate_max_unavailable)
         c.argument("mode", arg_type=get_enum_type(node_mode_types))
         c.argument("scale_down_mode", arg_type=get_enum_type(scale_down_modes))
         c.argument("max_pods", type=int, options_list=["--max-pods", "-m"])
@@ -1587,6 +1589,7 @@ def load_arguments(self, _):
         c.argument("drain_timeout", type=int)
         c.argument("node_soak_duration", type=int)
         c.argument("undrainable_node_behavior")
+        c.argument("max_unavailable", validator=validate_max_unavailable)
         c.argument("mode", arg_type=get_enum_type(node_mode_types))
         c.argument("scale_down_mode", arg_type=get_enum_type(scale_down_modes))
         # extensions
@@ -1657,6 +1660,7 @@ def load_arguments(self, _):
         c.argument("drain_timeout", type=int)
         c.argument("node_soak_duration", type=int)
         c.argument("undrainable_node_behavior")
+        c.argument("max_unavailable", validator=validate_max_unavailable)
         c.argument("snapshot_id", validator=validate_snapshot_id)
         c.argument(
             "yes",