Merge branch 'adsandor/breakmsg' of https://github.com/Sandido/azure-cli-extensions into adsandor/breakmsg

Author: Sandido

.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

.github/workflows/AddIssueComment.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
   thank-user:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     name: Say thanks for the Issue

.github/workflows/AddIssueCommentWithLabel.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   comment-non-security:
     if: contains(github.event.issue.labels.*.name, 'non-security')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     name: Comment on issue

src/aks-preview/HISTORY.rst

@@ -9,6 +9,22 @@ 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`.
@@ -24,9 +40,6 @@ To release a new version, please select a new version number (usually plus 1 to
 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",

src/aks-preview/azext_aks_preview/_validators.py

@@ -464,6 +464,22 @@ def validate_max_surge(namespace):
         raise CLIError("--max-surge should be an int or percentage")
 
 
+def validate_max_unavailable(namespace):
+    """validates parameters max unavailable are positive integers or percents."""
+    if namespace.max_unavailable is None:
+        return
+    int_or_percent = namespace.max_unavailable
+    if int_or_percent.endswith('%'):
+        int_or_percent = int_or_percent.rstrip('%')
+
+    try:
+        if int(int_or_percent) < 0:
+            raise CLIError("--max-unavailable must be positive")
+    except ValueError:
+        # pylint: disable=raise-missing-from
+        raise CLIError("--max-unavailable should be an int or percentage")
+
+
 def validate_assign_identity(namespace):
     if namespace.assign_identity is not None:
         if namespace.assign_identity == '':

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -477,6 +477,26 @@ def get_undrainable_node_behavior(self) -> str:
         # this parameter does not need validation
         return undrainable_node_behavior
 
+    def get_max_unavailable(self) -> str:
+        """Obtain the value of max_unavailable.
+
+        :return: string
+        """
+        # read the original value passed by the command
+        max_unavailable = self.raw_param.get("max_unavailable")
+        # In create mode, try to read the property value corresponding to the parameter from the `agentpool` object
+        if self.decorator_mode == DecoratorMode.CREATE:
+            if (
+                self.agentpool and
+                self.agentpool.upgrade_settings and
+                self.agentpool.upgrade_settings.max_unavailable is not None
+            ):
+                max_unavailable = self.agentpool.upgrade_settings.max_unavailable
+
+        # this parameter does not need dynamic completion
+        # this parameter does not need validation
+        return max_unavailable
+
     def get_enable_artifact_streaming(self) -> bool:
         """Obtain the value of enable_artifact_streaming.
         :return: bool
@@ -1042,6 +1062,10 @@ def set_up_upgrade_settings(self, agentpool: AgentPool) -> AgentPool:
         if undrainable_node_behavior:
             upgrade_settings.undrainable_node_behavior = undrainable_node_behavior
 
+        max_unavailable = self.context.get_max_unavailable()
+        if max_unavailable:
+            upgrade_settings.max_unavailable = max_unavailable
+
         agentpool.upgrade_settings = upgrade_settings
         return agentpool
 
@@ -1267,6 +1291,10 @@ def update_upgrade_settings(self, agentpool: AgentPool) -> AgentPool:
             upgrade_settings.undrainable_node_behavior = undrainable_node_behavior
             agentpool.upgrade_settings = upgrade_settings
 
+        max_unavailable = self.context.get_max_unavailable()
+        if max_unavailable:
+            upgrade_settings.max_unavailable = max_unavailable
+
         return agentpool
 
     def update_agentpool(self, agentpool: AgentPool) -> AgentPool:

src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py

@@ -152,17 +152,25 @@ def get_extension_installed_and_cluster_configs(
     cluster_name,
     agentpool_profiles
 ) -> Tuple[bool, bool, bool, bool, bool, float, str, str]:
-    client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
-    client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
-    k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
-    is_extension_installed = False
-    is_elasticSan_enabled = False
-    is_azureDisk_enabled = False
-    is_ephemeralDisk_nvme_enabled = False
-    is_ephemeralDisk_localssd_enabled = False
-    ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
-    perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
-    resource_cpu_value = -1
+
+    try:
+        client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
+        client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
+        k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
+        is_extension_installed = False
+        is_elasticSan_enabled = False
+        is_azureDisk_enabled = False
+        is_ephemeralDisk_nvme_enabled = False
+        is_ephemeralDisk_localssd_enabled = False
+        ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
+        perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+        resource_cpu_value = -1
+    except UnknownError as e:
+        logger.error(f"\nError fetching k8s extension module: {e}")
+        return False, False, False, False, False, -1, "", ""
+    except Exception as ex:
+        logger.error(f"\Exception occurred while fetching k8s extension module: {ex}")
+        return False, False, False, False, False, -1, "", ""
 
     try:
         extension = k8s_extension_custom_mod.show_k8s_extension(

src/aks-preview/azext_aks_preview/azuremonitormetrics/recordingrules/common.py

@@ -0,0 +1,8 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+
+def truncate_rule_group_name(name, max_length=260):
+    return name[:max_length]