[second iteration] bump k8s-extension version to 1.4.3 - including additional changes

.github/CODEOWNERS

@@ -242,8 +242,6 @@
 
 /src/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14
 
-/src/containerapp-preview/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14
-
 /src/scvmm/ @nascarsayan
 
 /src/spring/ @yuwzho

.gitignore

@@ -120,4 +120,7 @@ _build/
 # Mac desktop service store files
 .DS_Store
 
-_az_debug/
+_az_debug/
+
+# Ignore temporary test output files.
+/temp/

azure-pipelines.yml

@@ -155,6 +155,7 @@ jobs:
 
 - job: IndexRefDocVerify
   displayName: "Verify Ref Docs"
+  continueOnError: true
   pool:
     name: 'pool-ubuntu-2004'
   steps:

linter_exclusions.yml

@@ -2175,18 +2175,58 @@ networkfabric controller create:
     workload_er_connections:
       rule_exclusions:
       - option_length_too_long
+    is_workload_management_network_enabled:
+      rule_exclusions:
+      - option_length_too_long
+networkfabric controller update:
+  parameters:
+    workload_er_connections:
+      rule_exclusions:
+      - option_length_too_long
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric fabric update:
+  rule_exclusions:
+  - missing_command_test_coverage
 networkfabric rack create:
   rule_exclusions:
   - missing_command_test_coverage
 networkfabric rack delete:
   rule_exclusions:
   - missing_command_test_coverage
+networkfabric device create:
+  rule_exclusions:
+  - missing_command_test_coverage
 networkfabric device delete:
   rule_exclusions:
   - missing_command_test_coverage
+networkfabric interface create:
+  rule_exclusions:
+  - missing_command_test_coverage
 networkfabric interface delete:
   rule_exclusions:
   - missing_command_test_coverage
+networkfabric nni create:
+  parameters:
+    npb_static_route_configuration:
+      rule_exclusions:
+      - option_length_too_long
+    option_b_layer3_configuration:
+      rule_exclusions:
+      - option_length_too_long
+networkfabric nni update:
+  parameters:
+    npb_static_route_configuration:
+      rule_exclusions:
+      - option_length_too_long
+    option_b_layer3_configuration:
+      rule_exclusions:
+      - option_length_too_long
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric l2domain update:
+  rule_exclusions:
+  - missing_command_test_coverage
 networkfabric l3domain create:
   parameters:
     aggregate_route_configuration:
@@ -2201,11 +2241,65 @@ networkfabric l3domain create:
     redistribute_static_routes:
       rule_exclusions:
       - option_length_too_long
+networkfabric l3domain update:
+  parameters:
+    aggregate_route_configuration:
+      rule_exclusions:
+      - option_length_too_long
+    connected_subnet_route_policy:
+      rule_exclusions:
+      - option_length_too_long
+    redistribute_connected_subnets:
+      rule_exclusions:
+      - option_length_too_long
+    redistribute_static_routes:
+      rule_exclusions:
+      - option_length_too_long
+  rule_exclusions:
+  - missing_command_test_coverage
 networkfabric internalnetwork create:
   parameters:
     static_route_configuration:
       rule_exclusions:
       - option_length_too_long
+networkfabric internalnetwork update:
+  parameters:
+    static_route_configuration:
+      rule_exclusions:
+      - option_length_too_long
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric internetgateway update:
+  parameters:
+    internet_gateway_rule_id:
+      rule_exclusions:
+      - option_length_too_long
+networkfabric internetgatewayrule create:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric internetgatewayrule delete:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric internetgatewayrule list:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric internetgatewayrule show:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric internetgatewayrule update:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric externalnetwork update:
+  rule_exclusions:
+  - missing_command_test_coverage
+networkfabric ipextendedcommunity create:
+  parameters:
+    ip_extended_community_rules:
+      rule_exclusions:
+      - option_length_too_long
+networkfabric npb show:
+  rule_exclusions:
+  - missing_command_test_coverage
 notification-hub authorization-rule create:
   parameters:
     notification_hub_name:

src/aks-preview/HISTORY.rst

@@ -12,6 +12,12 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 ++++++
 
+0.5.150
++++++++
+* Vendor new SDK and bump API version to 2023-06-02-preview.
+* Add `--network-dataplane` to the `az aks update` command.
+* Support "VirtualMachines" agent pool type to `az aks create --vm-set-type` and `az aks nodepool add --vm-set-type`. This is internal use only, not for public preview.
+
 0.5.149
 +++++++
 * `az aks addon update`: Fix unexpected error 'Addon "web_application_routing" is not enabled in this cluster' when trying to update the web app routing addon for an managed cluster that already has it enabled.

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("2023-05-02-preview", {"container_services": "2017-07-01"}),
+        SDKProfile("2023-06-02-preview", {"container_services": "2017-07-01"}),
     )
 
 

src/aks-preview/azext_aks_preview/_consts.py

@@ -38,6 +38,7 @@
 # vm set type
 CONST_VIRTUAL_MACHINE_SCALE_SETS = "VirtualMachineScaleSets"
 CONST_AVAILABILITY_SET = "AvailabilitySet"
+CONST_VIRTUAL_MACHINES = "VirtualMachines"
 
 # vm size
 CONST_DEFAULT_NODE_VM_SIZE = "Standard_DS2_v2"

src/aks-preview/azext_aks_preview/_help.py

@@ -297,7 +297,7 @@
           short-summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 1000].
         - name: --vm-set-type
           type: string
-          short-summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
+          short-summary: Agent pool vm set type. VirtualMachineScaleSets, AvailabilitySet or VirtualMachines(internal use only).
         - name: --enable-pod-security-policy
           type: bool
           short-summary: Enable pod security policy.
@@ -846,6 +846,12 @@
           long-summary: |
               Used to control the mode the network plugin should operate in. For example, "overlay" used with
               --network-plugin=azure will use an overlay network (non-VNET IPs) for pods in the cluster.
+        - name: --network-dataplane
+          type: string
+          short-summary: The network dataplane to use.
+          long-summary: |
+              Network dataplane used in the Kubernetes cluster.
+              Specify "azure" to use the Azure dataplane (default) or "cilium" to enable Cilium dataplane.
         - name: --disk-driver-version
           type: string
           short-summary: Specify AzureDisk CSI Driver version.
@@ -1560,6 +1566,9 @@
         - 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.
+        - name: --vm-set-type
+          type: string
+          short-summary: Agent pool vm set type. VirtualMachineScaleSets, AvailabilitySet or VirtualMachines(internal use only).
         - name: --aks-custom-headers
           type: string
           short-summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2

src/aks-preview/azext_aks_preview/_params.py

@@ -457,6 +457,7 @@ def load_arguments(self, _):
         c.argument('nrg_lockdown_restriction_level', arg_type=get_enum_type(nrg_lockdown_restriction_levels))
         c.argument('nat_gateway_managed_outbound_ip_count', type=int, validator=validate_nat_gateway_managed_outbound_ip_count)
         c.argument('nat_gateway_idle_timeout', type=int, validator=validate_nat_gateway_idle_timeout)
+        c.argument('network_dataplane', arg_type=get_enum_type(network_dataplanes))
         c.argument('kube_proxy_config')
         c.argument('auto_upgrade_channel', arg_type=get_enum_type(auto_upgrade_channels))
         c.argument('node_os_upgrade_channel', arg_type=get_enum_type(node_os_upgrade_channels))
@@ -608,6 +609,7 @@ def load_arguments(self, _):
         c.argument('max_pods', type=int, options_list=['--max-pods', '-m'])
         c.argument('zones', zones_type, options_list=['--zones', '-z'], help='Space-separated list of availability zones where agent nodes will be placed.')
         c.argument('ppg')
+        c.argument('vm_set_type', validator=validate_vm_set_type)
         c.argument('enable_encryption_at_host', action='store_true')
         c.argument('enable_ultra_ssd', action='store_true')
         c.argument('enable_fips_image', action='store_true')

src/aks-preview/azext_aks_preview/_validators.py

@@ -186,9 +186,10 @@ def validate_vm_set_type(namespace):
         if namespace.vm_set_type == '':
             return
         if namespace.vm_set_type.lower() != "availabilityset" and \
+            namespace.vm_set_type.lower() != "virtualmachines" and \
                 namespace.vm_set_type.lower() != "virtualmachinescalesets":
             raise CLIError(
-                "--vm-set-type can only be VirtualMachineScaleSets or AvailabilitySet")
+                "--vm-set-type can only be VirtualMachineScaleSets, AvailabilitySet or VirtualMachines(internal use only)")
 
 
 def validate_load_balancer_sku(namespace):

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -9,6 +9,7 @@
 from typing import Dict, TypeVar, Union, List
 
 from azure.cli.command_modules.acs._consts import AgentPoolDecoratorMode, DecoratorMode
+
 from azure.cli.command_modules.acs.agentpool_decorator import (
     AKSAgentPoolAddDecorator,
     AKSAgentPoolContext,
@@ -26,7 +27,12 @@
 from knack.log import get_logger
 
 from azext_aks_preview._client_factory import cf_agent_pools
-from azext_aks_preview._consts import CONST_WORKLOAD_RUNTIME_OCI_CONTAINER
+from azext_aks_preview._consts import (
+    CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
+    CONST_VIRTUAL_MACHINE_SCALE_SETS,
+    CONST_AVAILABILITY_SET,
+    CONST_VIRTUAL_MACHINES
+)
 from azext_aks_preview._helpers import get_nodepool_snapshot_by_snapshot_id
 
 logger = get_logger(__name__)
@@ -68,6 +74,32 @@ def external_functions(self) -> SimpleNamespace:
             self.__external_functions = SimpleNamespace(**external_functions)
         return self.__external_functions
 
+    def get_vm_set_type(self) -> str:
+        """Obtain the value of vm_set_type, default value is CONST_VIRTUAL_MACHINE_SCALE_SETS.
+        :return: string
+        """
+        # read the original value passed by the command
+        vm_set_type = self.raw_param.get("vm_set_type", CONST_VIRTUAL_MACHINE_SCALE_SETS)
+        # try to read the property value corresponding to the parameter from the `agentpool` object
+        if self.agentpool_decorator_mode == AgentPoolDecoratorMode.MANAGED_CLUSTER:
+            if self.agentpool and self.agentpool.type is not None:
+                vm_set_type = self.agentpool.type
+        else:
+            if self.agentpool and self.agentpool.type_properties_type is not None:
+                vm_set_type = self.agentpool.type_properties_type
+
+        # normalize
+        if vm_set_type.lower() == CONST_VIRTUAL_MACHINE_SCALE_SETS.lower():
+            vm_set_type = CONST_VIRTUAL_MACHINE_SCALE_SETS
+        elif vm_set_type.lower() == CONST_AVAILABILITY_SET.lower():
+            vm_set_type = CONST_AVAILABILITY_SET
+        elif vm_set_type.lower() == CONST_VIRTUAL_MACHINES.lower():
+            vm_set_type = CONST_VIRTUAL_MACHINES
+        else:
+            raise InvalidArgumentValueError("--vm-set-type can only be VirtualMachineScaleSets, AvailabilitySet or VirtualMachines(internal use only)")
+        # this parameter does not need validation
+        return vm_set_type
+
     def get_crg_id(self) -> Union[str, None]:
         """Obtain the value of crg_id.
 

src/aks-preview/azext_aks_preview/custom.py

@@ -713,6 +713,7 @@ def aks_update(
     load_balancer_managed_outbound_ipv6_count=None,
     outbound_type=None,
     network_plugin_mode=None,
+    network_dataplane=None,
     pod_cidr=None,
     enable_pod_security_policy=False,
     disable_pod_security_policy=False,
@@ -1066,6 +1067,7 @@ def aks_agentpool_add(
     max_pods=0,
     zones=None,
     ppg=None,
+    vm_set_type=None,
     enable_encryption_at_host=False,
     enable_ultra_ssd=False,
     enable_fips_image=False,

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -3028,6 +3028,10 @@ def update_network_plugin_settings(self, mc: ManagedCluster) -> ManagedCluster:
         if network_plugin_mode:
             mc.network_profile.network_plugin_mode = network_plugin_mode
 
+        network_dataplane = self.context.get_network_dataplane()
+        if network_dataplane:
+            mc.network_profile.network_dataplane = network_dataplane
+
         pod_cidr = self.context.get_pod_cidr()
         if pod_cidr:
             mc.network_profile.pod_cidr = pod_cidr

src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_abort.yaml

@@ -16,7 +16,7 @@ interactions:
       - AZURECLI/2.49.0 azsdk-python-azure-mgmt-containerservice/23.0.0b Python/3.8.10
         (Linux-5.15.0-1039-azure-x86_64-with-glibc2.29)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-06-02-preview
   response:
     body:
       string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.ContainerService/managedClusters/cliakstest000002''
@@ -121,7 +121,7 @@ interactions:
       - AZURECLI/2.49.0 azsdk-python-azure-mgmt-containerservice/23.0.0b Python/3.8.10
         (Linux-5.15.0-1039-azure-x86_64-with-glibc2.29)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-06-02-preview
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -207,7 +207,7 @@ interactions:
       - AZURECLI/2.49.0 azsdk-python-azure-mgmt-containerservice/23.0.0b Python/3.8.10
         (Linux-5.15.0-1039-azure-x86_64-with-glibc2.29)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-06-02-preview
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -295,7 +295,7 @@ interactions:
       - AZURECLI/2.49.0 azsdk-python-azure-mgmt-containerservice/23.0.0b Python/3.8.10
         (Linux-5.15.0-1039-azure-x86_64-with-glibc2.29)
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2023-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2023-06-02-preview
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -524,7 +524,7 @@ interactions:
       - AZURECLI/2.49.0 azsdk-python-azure-mgmt-containerservice/23.0.0b Python/3.8.10
         (Linux-5.15.0-1039-azure-x86_64-with-glibc2.29)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2023-06-02-preview
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n