Merge branch 'main' of https://github.com/prathod09/azure-cli-extensions

Author: prathod09

.github/actions/env-setup/action.yml

@@ -10,7 +10,7 @@ runs:
         label: ${{ toJSON(github.event.label) }}
       shell: bash
       run: |
-        echo version cal job start
+        echo start azdev env setup
     - name: Checkout CLI extension repo
       uses: actions/checkout@v4
       with:

.github/workflows/AzdevLinter.yml

@@ -89,5 +89,9 @@ jobs:
           for mod in ${changed_module_list[@]}
           do
             echo changed module: "${mod}"
-            azdev extension add "${mod}" && azdev linter "${mod}" --min-severity medium --repo ./ --src "$diff_branch" --tgt "$merge_base" 
-          done
+            azdev extension add "${mod}"
+            # ado linter task
+            azdev linter "${mod}" --min-severity medium
+          done
+          # linter task that needs git commit info
+          azdev linter EXT --repo ./ --src "$diff_branch" --tgt "$merge_base" --rules missing_command_example

.github/workflows/AzdevStyle.yml

@@ -90,5 +90,5 @@ jobs:
           do
             echo changed module: "${mod}"
             azdev extension add "${mod}"
-            azdev style "${mod}" 
+            azdev style "${mod}"
           done

src/aks-preview/HISTORY.rst

@@ -12,6 +12,7 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 * Vendor new SDK and bump API version to 2025-01-02-preview.
+* Modify behavior for `--nodepool-initialization-taints` to ignore taints with hard effects on node pools with system mode when creating or updating a cluster.
 
 14.0.0b1
 +++++++

src/aks-preview/azext_aks_preview/_helpers.py

@@ -9,7 +9,7 @@
 import stat
 import sys
 import tempfile
-from typing import TypeVar
+from typing import List, TypeVar
 
 import yaml
 from azext_aks_preview._client_factory import (
@@ -374,3 +374,24 @@ def check_is_monitoring_addon_enabled(addons, instance):
     except Exception as ex:  # pylint: disable=broad-except
         logger.debug("failed to check monitoring addon enabled: %s", ex)
     return is_monitoring_addon_enabled
+
+
+def filter_hard_taints(node_initialization_taints: List[str]) -> List[str]:
+    filtered_taints = []
+    for taint in node_initialization_taints:
+        if not taint:
+            continue
+        # Parse the taint to get the effect
+        taint_parts = taint.split(":")
+        if len(taint_parts) == 2:
+            effect = taint_parts[-1].strip()
+            # Keep the taint if it has a soft effect (PreferNoSchedule)
+            # or if it's a CriticalAddonsOnly taint - AKS allows those on system pools
+            if effect.lower() == "prefernoschedule" or taint.lower().startswith("criticaladdonsonly"):
+                filtered_taints.append(taint)
+            else:
+                logger.warning('Taint %s with hard effect will be skipped from system pool', taint)
+        else:
+            # If the taint doesn't have a recognizable format, keep it, if it's incorrect - AKS-RP will return an error
+            filtered_taints.append(taint)
+    return filtered_taints

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -39,7 +39,10 @@
     CONST_DEFAULT_WINDOWS_NODE_VM_SIZE,
     CONST_SSH_ACCESS_LOCALUSER,
 )
-from azext_aks_preview._helpers import get_nodepool_snapshot_by_snapshot_id
+from azext_aks_preview._helpers import (
+    get_nodepool_snapshot_by_snapshot_id,
+    filter_hard_taints,
+)
 
 logger = get_logger(__name__)
 
@@ -870,7 +873,11 @@ def set_up_init_taints(self, agentpool: AgentPool) -> AgentPool:
         :return: the AgentPool object
         """
         self._ensure_agentpool(agentpool)
-        agentpool.node_initialization_taints = self.context.get_node_initialization_taints()
+        nodepool_initialization_taints = self.context.get_node_initialization_taints()
+        # filter out taints with hard effects for System pools
+        if agentpool.mode is None or agentpool.mode.lower() == "system":
+            nodepool_initialization_taints = filter_hard_taints(nodepool_initialization_taints)
+        agentpool.node_initialization_taints = nodepool_initialization_taints
         return agentpool
 
     def set_up_artifact_streaming(self, agentpool: AgentPool) -> AgentPool:

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -47,6 +47,7 @@
     check_is_private_cluster,
     get_cluster_snapshot_by_snapshot_id,
     setup_common_safeguards_profile,
+    filter_hard_taints,
 )
 from azext_aks_preview._loadbalancer import create_load_balancer_profile
 from azext_aks_preview._loadbalancer import (
@@ -4954,7 +4955,11 @@ def update_nodepool_initialization_taints_mc(self, mc: ManagedCluster) -> Manage
         nodepool_initialization_taints = self.context.get_nodepool_initialization_taints()
         if nodepool_initialization_taints is not None:
             for agent_profile in mc.agent_pool_profiles:
-                agent_profile.node_initialization_taints = nodepool_initialization_taints
+                if agent_profile.mode is not None and agent_profile.mode.lower() == "user":
+                    agent_profile.node_initialization_taints = nodepool_initialization_taints
+                    continue
+                # Filter out taints with hard effects (NoSchedule and NoExecute) for system pools
+                agent_profile.node_initialization_taints = filter_hard_taints(nodepool_initialization_taints)
         return mc
 
     def update_node_provisioning_mode(self, mc: ManagedCluster) -> ManagedCluster: