[AKS] Add Podsubnet argument to cluster create and nodepool add (Azure#2655)

Author: paulgmiller

src/aks-preview/azext_aks_preview/_help.py

@@ -205,6 +205,9 @@
         - name: --vnet-subnet-id
           type: string
           short-summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+        - name: --pod-subnet-id
+          type: string
+          short-summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin)
         - name: --ppg
           type: string
           short-summary: The ID of a PPG.
@@ -572,6 +575,9 @@
         - name: --vnet-subnet-id
           type: string
           short-summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+        - name: --pod-subnet-id
+          type: string
+          short-summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin)
         - name: --ppg
           type: string
           short-summary: The ID of a PPG.

src/aks-preview/azext_aks_preview/_params.py

@@ -22,7 +22,7 @@
     validate_load_balancer_outbound_ips, validate_load_balancer_outbound_ip_prefixes,
     validate_taints, validate_priority, validate_eviction_policy, validate_spot_max_price, validate_acr, validate_user,
     validate_load_balancer_outbound_ports, validate_load_balancer_idle_timeout, validate_nodepool_tags,
-    validate_nodepool_labels, validate_vnet_subnet_id, validate_max_surge, validate_assign_identity, validate_addons)
+    validate_nodepool_labels, validate_vnet_subnet_id, validate_pod_subnet_id, validate_max_surge, validate_assign_identity, validate_addons)
 from ._consts import CONST_OUTBOUND_TYPE_LOAD_BALANCER, \
     CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING, CONST_SCALE_SET_PRIORITY_REGULAR, CONST_SCALE_SET_PRIORITY_SPOT, \
     CONST_SPOT_EVICTION_POLICY_DELETE, CONST_SPOT_EVICTION_POLICY_DEALLOCATE, \
@@ -86,6 +86,7 @@ def load_arguments(self, _):
         c.argument('pod_cidr')
         c.argument('service_cidr')
         c.argument('vnet_subnet_id', type=str, validator=validate_vnet_subnet_id)
+        c.argument('pod_subnet_id', type=str, validator=validate_pod_subnet_id)
         c.argument('ppg')
         c.argument('workspace_resource_id')
         c.argument('skip_subnet_role_assignment', action='store_true')
@@ -167,6 +168,8 @@ def load_arguments(self, _):
             c.argument('ppg')
             c.argument('max_surge', type=str, validator=validate_max_surge)
             c.argument('node_os_disk_type', arg_type=get_enum_type([CONST_OS_DISK_TYPE_MANAGED, CONST_OS_DISK_TYPE_EPHEMERAL]))
+            c.argument('vnet_subnet_id', type=str, validator=validate_vnet_subnet_id)
+            c.argument('pod_subnet_id', type=str, validator=validate_pod_subnet_id)
             c.argument('kubelet_config', type=str)
             c.argument('linux_os_config', type=str)
 

src/aks-preview/azext_aks_preview/_validators.py

@@ -14,6 +14,7 @@
 
 from azure.cli.core.commands.validators import validate_tag
 from azure.cli.core.util import CLIError
+from azure.cli.core.azclierror import InvalidArgumentValueError
 import azure.cli.core.keys as keys
 
 from .vendored_sdks.azure_mgmt_preview_aks.v2020_11_01.models import ManagedClusterPropertiesAutoScalerProfile
@@ -234,12 +235,19 @@ def validate_user(namespace):
 
 
 def validate_vnet_subnet_id(namespace):
-    if namespace.vnet_subnet_id is not None:
-        if namespace.vnet_subnet_id == '':
-            return
-        from msrestazure.tools import is_valid_resource_id
-        if not is_valid_resource_id(namespace.vnet_subnet_id):
-            raise CLIError("--vnet-subnet-id is not a valid Azure resource ID.")
+    _validate_subnet_id(namespace.vnet_subnet_id, "--vnet-subnet-id")
+
+
+def validate_pod_subnet_id(namespace):
+    _validate_subnet_id(namespace.pod_subnet_id, "--pod-subnet-id")
+
+
+def _validate_subnet_id(subnet_id, name):
+    if subnet_id is None or subnet_id == '':
+        return
+    from msrestazure.tools import is_valid_resource_id
+    if not is_valid_resource_id(subnet_id):
+        raise InvalidArgumentValueError(name + " is not a valid Azure resource ID.")
 
 
 def validate_load_balancer_outbound_ports(namespace):

src/aks-preview/azext_aks_preview/custom.py

@@ -851,6 +851,7 @@ def aks_create(cmd,     # pylint: disable=too-many-locals,too-many-statements,to
                min_count=None,
                max_count=None,
                vnet_subnet_id=None,
+               pod_subnet_id=None,
                ppg=None,
                max_pods=0,
                aad_client_app_id=None,
@@ -922,6 +923,7 @@ def aks_create(cmd,     # pylint: disable=too-many-locals,too-many-statements,to
         os_type="Linux",
         mode="System",
         vnet_subnet_id=vnet_subnet_id,
+        pod_subnet_id=pod_subnet_id,
         proximity_placement_group_id=ppg,
         availability_zones=node_zones,
         enable_node_public_ip=enable_node_public_ip,
@@ -2320,6 +2322,7 @@ def aks_agentpool_add(cmd,      # pylint: disable=unused-argument,too-many-local
                       node_osdisk_size=0,
                       node_count=3,
                       vnet_subnet_id=None,
+                      pod_subnet_id=None,
                       ppg=None,
                       max_pods=0,
                       os_type="Linux",
@@ -2372,6 +2375,7 @@ def aks_agentpool_add(cmd,      # pylint: disable=unused-argument,too-many-local
         os_type=os_type,
         storage_profile=ContainerServiceStorageProfileTypes.managed_disks,
         vnet_subnet_id=vnet_subnet_id,
+        pod_subnet_id=pod_subnet_id,
         proximity_placement_group_id=ppg,
         agent_pool_type="VirtualMachineScaleSets",
         max_pods=int(max_pods) if max_pods else None,

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

@@ -118,35 +118,24 @@ def __init__(self, api_server_authorized_ip_ranges=None, cluster_autoscaler_prof
         self.cluster_autoscaler_profile = cluster_autoscaler_profile
 
 
-class TestVNetSubnetId(unittest.TestCase):
-    def test_invalid_vnet_subnet_id(self):
+class TestSubnetId(unittest.TestCase):
+    def test_invalid_subnet_id(self):
         invalid_vnet_subnet_id = "dummy subnet id"
-        namespace = VnetSubnetIdNamespace(invalid_vnet_subnet_id)
         err = ("--vnet-subnet-id is not a valid Azure resource ID.")
 
         with self.assertRaises(CLIError) as cm:
-            validators.validate_vnet_subnet_id(namespace)
+            validators._validate_subnet_id(invalid_vnet_subnet_id, "--vnet-subnet-id")
         self.assertEqual(str(cm.exception), err)
 
     def test_valid_vnet_subnet_id(self):
-        invalid_vnet_subnet_id = "/subscriptions/testid/resourceGroups/MockedResourceGroup/providers/Microsoft.Network/virtualNetworks/MockedNetworkId/subnets/MockedSubNetId"
-        namespace = VnetSubnetIdNamespace(invalid_vnet_subnet_id)
-        validators.validate_vnet_subnet_id(namespace)
+        valid_subnet_id = "/subscriptions/testid/resourceGroups/MockedResourceGroup/providers/Microsoft.Network/virtualNetworks/MockedNetworkId/subnets/MockedSubNetId"
+        validators._validate_subnet_id(valid_subnet_id, "something")
 
     def test_none_vnet_subnet_id(self):
-        invalid_vnet_subnet_id = None
-        namespace = VnetSubnetIdNamespace(invalid_vnet_subnet_id)
-        validators.validate_vnet_subnet_id(namespace)
+        validators._validate_subnet_id(None, "something")
 
     def test_empty_vnet_subnet_id(self):
-        invalid_vnet_subnet_id = ""
-        namespace = VnetSubnetIdNamespace(invalid_vnet_subnet_id)
-        validators.validate_vnet_subnet_id(namespace)
-
-
-class VnetSubnetIdNamespace:
-    def __init__(self, vnet_subnet_id):
-        self.vnet_subnet_id = vnet_subnet_id
+        validators._validate_subnet_id("", "something")
 
 
 class MaxSurgeNamespace: