rename to --managed-system-pool

Author: Hao Yuan

src/aks-preview/azext_aks_preview/_help.py

@@ -651,7 +651,7 @@
         - name: --vm-sizes
           type: string
           short-summary: Comma-separated list of sizes. Must use VirtualMachines agent pool type.
-        - name: --enable-managed-system-pool
+        - name: --managed-system-pool
           type: bool
           short-summary: Create a default ManagedSystem mode that is fully managed by AKS.
           long-summary: When set, the default system node pool is created with ManagedSystem mode, where all properties except name and mode are managed by AKS. Learn more at https://aka.ms/aks/nodepool/mode.
@@ -735,7 +735,7 @@
         - name: Create a kubernetes cluster with a VirtualMachines nodepool
           text: az aks create -g MyResourceGroup -n MyManagedCluster --vm-set-type VirtualMachines --vm-sizes "VMSize1,VMSize2" --node-count 3
         - name: Create a kubernetes cluster with a fully managed system node pool
-          text: az aks create -g MyResourceGroup -n MyManagedCluster --enable-managed-system-pool
+          text: az aks create -g MyResourceGroup -n MyManagedCluster --managed-system-pool
 
 """
 

src/aks-preview/azext_aks_preview/_params.py

@@ -962,7 +962,7 @@ def load_arguments(self, _):
         # virtual machines
         c.argument("vm_sizes", is_preview=True)
         c.argument("enable_imds_restriction", action="store_true", is_preview=True)
-        c.argument("enable_managed_system_pool", action="store_true", is_preview=True)
+        c.argument("managed_system_pool", action="store_true", is_preview=True)
 
     with self.argument_context("aks update") as c:
         # managed cluster paramerters

src/aks-preview/azext_aks_preview/custom.py

@@ -733,7 +733,7 @@ def aks_create(
     # IMDS restriction
     enable_imds_restriction=False,
     # managed system pool
-    enable_managed_system_pool=False,
+    managed_system_pool=False,
 ):
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -1231,15 +1231,15 @@ def get_disable_image_integrity(self) -> bool:
 
         return disable_image_integrity
 
-    def get_enable_managed_system_pool(self) -> bool:
-        """Obtain the value of enable_managed_system_pool.
+    def get_managed_system_pool(self) -> bool:
+        """Obtain the value of managed_system_pool.
 
         :return: bool
         """
         # read the original value passed by the command
-        enable_managed_system_pool = self.raw_param.get("enable_managed_system_pool")
+        managed_system_pool = self.raw_param.get("managed_system_pool")
 
-        return enable_managed_system_pool
+        return managed_system_pool
 
     def get_cluster_snapshot_id(self) -> Union[str, None]:
         """Obtain the values of cluster_snapshot_id.
@@ -2923,9 +2923,9 @@ def init_agentpool_decorator_context(self) -> None:
 
         :return: None
         """
-        # If enable_managed_system_pool is True, set the mode to ManagedSystem for the default nodepool
+        # If managed_system_pool is True, set the mode to ManagedSystem for the default nodepool
         raw_parameters = self.__raw_parameters.copy()
-        if self.context.get_enable_managed_system_pool():
+        if self.context.get_managed_system_pool():
             raw_parameters["mode"] = CONST_NODEPOOL_MODE_MANAGEDSYSTEM
 
         self.agentpool_decorator = AKSPreviewAgentPoolAddDecorator(

src/aks-preview/azext_aks_preview/tests/latest/demo_enable_managed_system_pool.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 """
-Demonstration script showing the --enable-managed-system-pool functionality
+Demonstration script showing the --managed-system-pool functionality
 
-This script demonstrates how the --enable-managed-system-pool flag works
+This script demonstrates how the --managed-system-pool flag works
 by simulating the parameter flow through the AKS CLI extension.
 
-Usage: python demo_enable_managed_system_pool.py
+Usage: python demo_managed_system_pool.py
 """
 
 import os
@@ -24,24 +24,24 @@
     AKSManagedClusterParamDict
 
 
-def demonstrate_enable_managed_system_pool():
-    """Demonstrate the enable_managed_system_pool functionality"""
+def demonstrate_managed_system_pool():
+    """Demonstrate the managed_system_pool functionality"""
 
-    print("🔧 AKS CLI Extension: --enable-managed-system-pool Demonstration")
-    print("=" * 65)
+    print("🔧 AKS CLI Extension: --managed-system-pool Demonstration")
+    print("=" * 60)
 
     # Mock command and models
     cmd = Mock()
     models = Mock()
 
-    print("\n📋 Scenario 1: User runs 'az aks create --enable-managed-system-pool'")
-    print("-" * 65)
+    print("\n📋 Scenario 1: User runs 'az aks create --managed-system-pool'")
+    print("-" * 60)
 
-    # Simulate user parameters when --enable-managed-system-pool is used
+    # Simulate user parameters when --managed-system-pool is used
     user_parameters = {
         "cluster_name": "my-aks-cluster",
         "resource_group": "my-rg",
-        "enable_managed_system_pool": True,
+        "managed_system_pool": True,
         "nodepool_name": "nodepool1",
         "node_vm_size": "Standard_D2s_v3",
         "node_count": 3,
@@ -58,22 +58,22 @@ def demonstrate_enable_managed_system_pool():
     )
 
     # Check what the getter returns
-    enable_managed_system_pool = ctx.get_enable_managed_system_pool()
-    print(f"🔍 get_enable_managed_system_pool() returns: {enable_managed_system_pool}")
+    managed_system_pool = ctx.get_managed_system_pool()
+    print(f"🔍 get_managed_system_pool() returns: {managed_system_pool}")
 
     # Simulate the parameter modification logic
     agentpool_parameters = user_parameters.copy()
-    if enable_managed_system_pool:
+    if managed_system_pool:
         agentpool_parameters["mode"] = CONST_NODEPOOL_MODE_MANAGEDSYSTEM
         print(f"✅ Mode set to: {CONST_NODEPOOL_MODE_MANAGEDSYSTEM}")
     else:
         print("❌ Mode not modified")
 
     print(f"📤 Parameters passed to agentpool decorator: {agentpool_parameters}")
 
-    print("\n" + "=" * 65)
+    print("\n" + "=" * 60)
     print("📋 Scenario 2: User runs 'az aks create' (without the flag)")
-    print("-" * 65)
+    print("-" * 60)
 
     # Simulate user parameters without the flag
     user_parameters_without_flag = {
@@ -95,27 +95,27 @@ def demonstrate_enable_managed_system_pool():
     )
 
     # Check what the getter returns
-    enable_managed_system_pool2 = ctx2.get_enable_managed_system_pool()
-    print(f"🔍 get_enable_managed_system_pool() returns: {enable_managed_system_pool2}")
+    managed_system_pool2 = ctx2.get_managed_system_pool()
+    print(f"🔍 get_managed_system_pool() returns: {managed_system_pool2}")
 
     # Simulate the parameter modification logic
     agentpool_parameters2 = user_parameters_without_flag.copy()
-    if enable_managed_system_pool2:
+    if managed_system_pool2:
         agentpool_parameters2["mode"] = CONST_NODEPOOL_MODE_MANAGEDSYSTEM
         print(f"✅ Mode set to: {CONST_NODEPOOL_MODE_MANAGEDSYSTEM}")
     else:
         print("❌ Mode not modified (normal System mode will be used)")
 
     print(f"📤 Parameters passed to agentpool decorator: {agentpool_parameters2}")
 
-    print("\n" + "=" * 65)
+    print("\n" + "=" * 60)
     print("🎯 Summary")
-    print("-" * 65)
-    print("✅ When --enable-managed-system-pool is used:")
+    print("-" * 60)
+    print("✅ When --managed-system-pool is used:")
     print("   • The default system nodepool will be created in ManagedSystem mode")
     print("   • AKS fully manages the nodepool (users cannot modify it)")
     print("   • Provides a hands-off experience for system nodepools")
-    print("\n❌ When --enable-managed-system-pool is NOT used:")
+    print("\n❌ When --managed-system-pool is NOT used:")
     print("   • The default system nodepool will be created in normal System mode")
     print("   • Users can modify the nodepool as needed")
     print("   • Traditional AKS nodepool management applies")
@@ -130,4 +130,4 @@ def demonstrate_enable_managed_system_pool():
 
 
 if __name__ == "__main__":
-    demonstrate_enable_managed_system_pool()
+    demonstrate_managed_system_pool()

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -847,7 +847,6 @@ def test_aks_byo_subnet_with_ingress_appgw_addon(
             "aks create --resource-group={resource_group} --name={aks_name} --enable-managed-identity "
             "--vnet-subnet-id {vnet_id}/subnets/aks-subnet -a ingress-appgw "
             "--appgw-name gateway --appgw-subnet-id {vnet_id}/subnets/appgw-subnet "
-            "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview "
             "--yes --ssh-key-value={ssh_key_value} -o json"
         )
         aks_cluster = self.cmd(
@@ -968,7 +967,6 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(
             "aks create -n {aks_name} -g {resource_group} --enable-managed-identity "
             "--vnet-subnet-id {vnet_id}/subnets/aks-subnet "
             "-a ingress-appgw --appgw-id {appgw_id} --yes "
-            "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview "
             "--ssh-key-value={ssh_key_value} -o json"
         )
         aks_cluster = self.cmd(
@@ -15754,11 +15752,17 @@ def test_aks_network_isolated_cluster(self, resource_group, resource_group_locat
                 "acr_id": acr_id,
             }
         )
+        # enable anonymous pull for ACR
+        update_acr_cmd = (
+            "acr update --resource-group {resource_group} --name {acr_name} "
+            "--anonymous-pull-enabled true -o json"
+        )
+        self.cmd(update_acr_cmd, checks=[self.check("provisioningState", "Succeeded")])
 
         # enable acr artifact cache
         enable_acr_artifact_cache_cmd = (
-            "acr cache create -n aks-managed-mcr -r {acr_name} "
-            "--source-repo \"mcr.microsoft.com/*\" --target-repo \"aks-managed-repository/*\" -o json"
+            "acr cache create -n aks-mcr -r {acr_name} "
+            "--source-repo \"mcr.microsoft.com/*\" --target-repo \"*\" -o json"
         )
         self.cmd(enable_acr_artifact_cache_cmd, checks=[self.check("provisioningState", "Succeeded")])
 

src/aks-preview/azext_aks_preview/tests/latest/test_enable_managed_system_pool.py

@@ -16,51 +16,51 @@
     AKSManagedClusterParamDict
 
 
-class EnableManagedSystemPoolTestCase(unittest.TestCase):
-    """Test cases for the --enable-managed-system-pool functionality"""
+class ManagedSystemPoolTestCase(unittest.TestCase):
+    """Test cases for the --managed-system-pool functionality"""
 
     def setUp(self):
         """Set up test fixtures"""
         self.cmd = Mock()
         self.client = Mock()
         self.models = Mock()
 
-    def test_get_enable_managed_system_pool_context(self):
-        """Test the get_enable_managed_system_pool method in AKSPreviewManagedClusterContext"""
+    def test_get_managed_system_pool_context(self):
+        """Test the get_managed_system_pool method in AKSPreviewManagedClusterContext"""
 
-        # Test with enable_managed_system_pool=True
+        # Test with managed_system_pool=True
         ctx1 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_managed_system_pool": True}),
+            AKSManagedClusterParamDict({"managed_system_pool": True}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx1.get_enable_managed_system_pool(), True)
+        self.assertEqual(ctx1.get_managed_system_pool(), True)
 
-        # Test with enable_managed_system_pool=False
+        # Test with managed_system_pool=False
         ctx2 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_managed_system_pool": False}),
+            AKSManagedClusterParamDict({"managed_system_pool": False}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx2.get_enable_managed_system_pool(), False)
+        self.assertEqual(ctx2.get_managed_system_pool(), False)
 
-        # Test with enable_managed_system_pool=None (default)
+        # Test with managed_system_pool=None (default)
         ctx3 = AKSPreviewManagedClusterContext(
             self.cmd,
             AKSManagedClusterParamDict({}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx3.get_enable_managed_system_pool(), None)
+        self.assertEqual(ctx3.get_managed_system_pool(), None)
 
     def test_raw_parameter_modification_logic(self):
         """Test the parameter modification logic that sets mode to ManagedSystem"""
 
-        # Test with enable_managed_system_pool=True
+        # Test with managed_system_pool=True
         raw_parameters_true = {
-            "enable_managed_system_pool": True,
+            "managed_system_pool": True,
             "nodepool_name": "test_np_name",
             "node_vm_size": "Standard_D2s_v3",
         }
@@ -74,15 +74,15 @@ def test_raw_parameter_modification_logic(self):
 
         # Simulate the logic from init_agentpool_decorator_context
         modified_raw_parameters = raw_parameters_true.copy()
-        if ctx_true.get_enable_managed_system_pool():
+        if ctx_true.get_managed_system_pool():
             modified_raw_parameters["mode"] = CONST_NODEPOOL_MODE_MANAGEDSYSTEM
 
         # Verify the mode was set
         self.assertEqual(modified_raw_parameters.get("mode"), CONST_NODEPOOL_MODE_MANAGEDSYSTEM)
 
-        # Test with enable_managed_system_pool=False
+        # Test with managed_system_pool=False
         raw_parameters_false = {
-            "enable_managed_system_pool": False,
+            "managed_system_pool": False,
             "nodepool_name": "test_np_name",
         }
 
@@ -95,7 +95,7 @@ def test_raw_parameter_modification_logic(self):
 
         # Simulate the logic from init_agentpool_decorator_context
         modified_raw_parameters_false = raw_parameters_false.copy()
-        if ctx_false.get_enable_managed_system_pool():
+        if ctx_false.get_managed_system_pool():
             modified_raw_parameters_false["mode"] = CONST_NODEPOOL_MODE_MANAGEDSYSTEM
 
         # Verify the mode was NOT set

src/aks-preview/azext_aks_preview/tests/latest/test_managed_cluster_decorator.py

@@ -215,33 +215,33 @@ def test_get_addon_consts(self):
         }
         self.assertEqual(addon_consts, ground_truth_addon_consts)
 
-    def test_get_enable_managed_system_pool(self):
+    def test_get_managed_system_pool(self):
         # default - parameter not specified
         ctx_1 = AKSPreviewManagedClusterContext(
             self.cmd,
             AKSManagedClusterParamDict({}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_1.get_enable_managed_system_pool(), None)
+        self.assertEqual(ctx_1.get_managed_system_pool(), None)
 
         # enabled
         ctx_2 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_managed_system_pool": True}),
+            AKSManagedClusterParamDict({"managed_system_pool": True}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_2.get_enable_managed_system_pool(), True)
+        self.assertEqual(ctx_2.get_managed_system_pool(), True)
 
         # disabled
         ctx_3 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_managed_system_pool": False}),
+            AKSManagedClusterParamDict({"managed_system_pool": False}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_3.get_enable_managed_system_pool(), False)
+        self.assertEqual(ctx_3.get_managed_system_pool(), False)
 
     def test_get_http_proxy_config(self):
         # default