Merge branch 'main' into copilot/fix-1

Author: serbrech

.github/policies/resourceManagement.yml

@@ -614,13 +614,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mksuni
-            - bgklein
-            - mscurrell
             - dpwatrous
-            - gingi
-            - paterasMSFT
+            - wiboris
             - cRui861
+            - skapur12
+            - wanghoppe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

linter_exclusions.yml

@@ -1415,20 +1415,44 @@ iot edge deployment update:
       - no_parameter_defaults_for_update_commands
 iot ops asset create:
   parameters:
-    cluster_resource_group:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-    custom_location_resource_group:
+iot ops asset query:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops asset endpoint create custom:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops asset endpoint create onvif:
+  parameters:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-iot ops asset endpoint create:
+iot ops asset endpoint create opcua:
   parameters:
-    cluster_resource_group:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-    custom_location_resource_group:
+iot ops asset endpoint query:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops ns device create:
+  parameters:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
+iot ops broker persist update:
+  parameters:
+    broker_name:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
 k8sconfiguration create:
   parameters:
     helm_operator_version:

src/aks-preview/HISTORY.rst

@@ -11,22 +11,31 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
-* Add support for `ManagedSystem` Agent Pool Mode.
 
-18.0.0b19
+18.0.0b22
 +++++++
-- Add `--localdns-config` to `az aks nodepool add` and to `az aks nodepool update` to support configuring a local DNS profile for agent pools.
+* Vendor new SDK and bump API version to 2025-06-02-preview.
 
+18.0.0b21
++++++++
+* Add command `az aks bastion` to enable connections to managed Kubernetes clusters via Azure Bastion.
 
-18.0.0b18
+18.0.0b20
 +++++++
-* Add validation error when neither --location or --cluster and --resource-group-name are specified for az extension type list or az extension type version list
+* Fix the bug affecting VMAS to VMS migration in the `az aks update` command using the `--migrate-vmas-to-vms` option.
 
+18.0.0b19
++++++++
+* Add support for `ManagedSystem` Agent Pool Mode.
+* Add `--localdns-config` to `az aks nodepool add` and to `az aks nodepool update` to support configuring a local DNS profile for agent pools.
 
+18.0.0b18
++++++++
+* Add validation error when neither --location or --cluster and --resource-group-name are specified for az extension type list or az extension type version list
 
 18.0.0b17
 +++++++
-* Remove `__import__('pkg_resources').declare_namespace(__name__)` from `vendored_sdks/__init__.py`` to fix the namespace package issue.
+* Remove `__import__('pkg_resources').declare_namespace(__name__)` from `vendored_sdks/__init__.py` to fix the namespace package issue.
 
 18.0.0b16
 +++++++

src/aks-preview/README.rst

@@ -203,6 +203,9 @@ Released version and adopted API version
     * - 18.0.0b11 ~ 18.0.0b15
       - 2025-04-02-preview
       -
-    * - 18.0.0b16 ~ latest
+    * - 18.0.0b16 ~ 18.0.0b21
       - 2025-05-02-preview
+      -
+    * - 18.0.0b22 ~ latest
+      - 2025-06-02-preview
       -

src/aks-preview/azext_aks_preview/__init__.py

@@ -5,7 +5,7 @@
 
 
 from azure.cli.core import AzCommandsLoader
-from azure.cli.core.profiles import register_resource_type, SDKProfile
+from azure.cli.core.profiles import register_resource_type
 
 # pylint: disable=unused-import
 import azext_aks_preview._help
@@ -16,7 +16,7 @@ def register_aks_preview_resource_type():
     register_resource_type(
         "latest",
         CUSTOM_MGMT_AKS_PREVIEW,
-        SDKProfile("2025-05-02-preview", {"container_services": "2017-07-01"}),
+        None,
     )
 
 

src/aks-preview/azext_aks_preview/_help.py

@@ -3864,3 +3864,24 @@
         - name: Show details of a load balancer configuration in table format
           text: az aks loadbalancer show -g MyResourceGroup -n kubernetes --cluster-name MyManagedCluster -o table
 """
+
+helps['aks bastion'] = """
+    type: command
+    short-summary: Connect to a managed Kubernetes cluster using Azure Bastion.
+    long-summary: The command will launch a subshell with the kubeconfig set to connect to the cluster via Bastion. Use exit or Ctrl-D (i.e. EOF) to exit the subshell.
+    parameters:
+        - name: --bastion
+          type: string
+          short-summary: The name or resource ID of a pre-deployed Bastion resource configured to connect to the current AKS cluster.
+          long-summary: If not specified, the command will try to identify an existing Bastion resource within the cluster's node resource group.
+        - name: --port
+          type: int
+          short-summary: The local port number used for the bastion connection.
+          long-summary: If not provided, a random port will be used.
+        - name: --admin
+          type: bool
+          short-summary: Use the cluster admin credentials to connect to the bastion.
+    examples:
+        - name: Connect to a managed Kubernetes cluster using Azure Bastion with custom port and admin credentials.
+          text: az aks bastion -g MyResourceGroup --name MyManagedCluster --bastion MyBastionResource --port 50001 --admin
+"""

src/aks-preview/azext_aks_preview/_params.py

@@ -2761,6 +2761,17 @@ def load_arguments(self, _):
                 help="Name of the load balancer configuration. Required.",
             )
 
+    with self.argument_context("aks bastion") as c:
+        c.argument("bastion")
+        c.argument("port", type=int)
+        c.argument("admin", action="store_true")
+        c.argument(
+            "yes",
+            options_list=["--yes", "-y"],
+            help="Do not prompt for confirmation.",
+            action="store_true",
+        )
+
 
 def _get_default_install_location(exe_name):
     system = platform.system()