Merge branch 'main' into containers-from-image

Author: DomAyre

src/aks-preview/HISTORY.rst

@@ -11,11 +11,16 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+
+
+19.0.0b19
++++++++
 * Add add-on support for `ApplicationLoadBalancer` (Application Gateway for Containers)
-- AKS Create and Update parameters for `--enable-application-load-balancer` and `--disable-application-load-balancer`
- - `az aks applicationloadbalancer enable`: Enable Application Load Balancer add-on for an existing cluster.
- - `az aks applicationloadbalancer disable`: Disable Application Load Balancer add-on for an existing cluster.
- - `az aks applicationloadbalancer update`: Update Application Load Balancer add-on for an existing cluster.
+* AKS Create and Update parameters for `--enable-application-load-balancer` and `--disable-application-load-balancer`
+  * `az aks applicationloadbalancer enable`: Enable Application Load Balancer add-on for an existing cluster.
+  * `az aks applicationloadbalancer disable`: Disable Application Load Balancer add-on for an existing cluster.
+  * `az aks applicationloadbalancer update`: Update Application Load Balancer add-on for an existing cluster.
+* Remove prerequisite for `--enable-gateway-api` option in `az aks create` and `az aks update` commands - managed Gateway API ingress provider enablement no longer required
 
 19.0.0b18
 +++++++

src/aks-preview/azext_aks_preview/_help.py

@@ -695,7 +695,7 @@
           short-summary: Enable user-defined scheduler configuration for kube-scheduler upstream on the cluster
         - name: --enable-gateway-api
           type: bool
-          short-summary: Enable managed installation of Gateway API CRDs from the standard release channel. Requires at least one managed Gateway API ingress provider to be enabled.
+          short-summary: Enable managed installation of Gateway API CRDs from the standard release channel.
         - name: --enable-hosted-system
           type: bool
           short-summary: Create a cluster with fully hosted system components. This applies only when creating a new automatic cluster.
@@ -788,8 +788,8 @@
           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
-        - name: Create a kubernetes cluster with the Azure Service Mesh addon enabled with a managed installation of Gateway API CRDs from the standard release channel.
-          text: az aks create -g MyResourceGroup -n MyManagedCluster --enable-azure-service-mesh --enable-gateway-api
+        - name: Create a kubernetes cluster with a managed installation of Gateway API CRDs from the standard release channel.
+          text: az aks create -g MyResourceGroup -n MyManagedCluster --enable-gateway-api
         - name: Create an automatic cluster with hosted system components enabled.
           text: az aks create -g MyResourceGroup -n MyManagedCluster --sku automatic --enable-hosted-system
 
@@ -1417,7 +1417,7 @@
           short-summary: Disable user-defined scheduler configuration for kube-scheduler upstream on the cluster
         - name: --enable-gateway-api
           type: bool
-          short-summary: Enable managed installation of Gateway API CRDs from the standard release channel. Requires at least one managed Gateway API ingress provider to be enabled.
+          short-summary: Enable managed installation of Gateway API CRDs from the standard release channel.
         - name: --disable-gateway-api
           type: bool
           short-summary: Disable managed installation of Gateway API CRDs.

…th_gateway_api_and_azureservicemesh.yaml …th_gateway_api_and_azureservicemesh.yamlsrc/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_with_gateway_api_and_azureservicemesh.yaml renamed to src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_gateway_api_and_azureservicemesh.yaml src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_with_gateway_api_and_azureservicemesh.yaml renamed to src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_gateway_api_and_azureservicemesh.yaml

@@ -21528,7 +21528,7 @@ def test_aks_jwtauthenticator_cmds(self, resource_group, resource_group_location
     @AKSCustomResourceGroupPreparer(
         random_name_length=17, name_prefix="clitest", location="centraluseuap"
     )
-    def test_aks_create_with_gateway_api_and_azureservicemesh(
+    def test_aks_create_and_update_with_gateway_api_and_azureservicemesh(
         self, resource_group, resource_group_location
     ):
         aks_name = self.create_random_name("cliakstest", 16)
@@ -21589,65 +21589,5 @@ def test_aks_create_with_gateway_api_and_azureservicemesh(
             ],
         )
 
-
-    @AllowLargeResponse()
-    @AKSCustomResourceGroupPreparer(
-        random_name_length=17, name_prefix="clitest", location="centraluseuap"
-    )
-    def test_aks_managed_gateway_requires_service_mesh(
-        self, resource_group, resource_group_location
-    ):
-        """
-        Verify that enabling managed Gateway API requires a Gateway API implementation (e.g., Azure Service Mesh).
-
-        This test:
-        - Attempts and fails to create a cluster with --enable-gateway-api without ASM enabled.
-        - Creates a minimal cluster.
-        - Attempts and fails to update it with --enable-gateway-api (still without ASM).
-        """
-
-        # reset the count so in replay mode the random names will start with 0
-        self.test_resources_count = 0
-
-        aks_name = self.create_random_name("cliakstest", 16)
-        self.kwargs.update(
-            {
-                "resource_group": resource_group,
-                "name": aks_name,
-                "ssh_key_value": self.generate_ssh_keys(),
-                "location": resource_group_location,
-            }
-        )
-
-        # Attempt and expect failure to create a cluster with Gateway API but without ASM
-        create_with_gateway_cmd = (
-            "aks create --resource-group={resource_group} --name={name} "
-            "--enable-gateway-api "
-            "--ssh-key-value={ssh_key_value} -o json "
-            "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/ManagedGatewayAPIPreview "
-        )
-        self.cmd(create_with_gateway_cmd, expect_failure=True)
-
-        # Create a minimal cluster without Gateway API or ASM
-        create_minimal_cmd = (
-            "aks create --resource-group={resource_group} --name={name} "
-            "--ssh-key-value={ssh_key_value} -o json"
-        )
-        self.cmd(
-            create_minimal_cmd,
-            checks=[
-                self.check("provisioningState", "Succeeded"),
-            ],
-        )
-
-        # Attempt and expect failure to enable Gateway API on an existing cluster without ASM
-        update_enable_gateway_cmd = (
-            "aks update --resource-group={resource_group} --name={name} "
-            "--enable-gateway-api "
-            "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/ManagedGatewayAPIPreview "
-        )
-        self.cmd(update_enable_gateway_cmd, expect_failure=True)
-
-        # Cleanup
-        delete_cmd = "aks delete --resource-group={resource_group} --name={name} --yes --no-wait"
-        self.cmd(delete_cmd, checks=[self.is_empty()])
+    # TODO (zheweihu): add test `test_aks_create_and_update_with_gateway_api_without_azureservicemesh`
+    # once https://msazure.visualstudio.com/CloudNativeCompute/_git/aks-rp/pullrequest/14404771 is rolled out

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

@@ -9,7 +9,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "19.0.0b18"
+VERSION = "19.0.0b19"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",

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

@@ -7,6 +7,10 @@ Release History
 ++++++
 * Added confcom containers from_image command to generate container definitions from an image reference
 
+1.5.1
+++++++
+* Bumped the Kata genpolicy version to gen4
+
 1.5.0
 ++++++
 * restored the behaviour of --upload-fragment in acifragmentgen to attach to first image in input

src/aks-preview/setup.py

@@ -23,8 +23,8 @@
 _kata_binaries = {
     "Linux": {
         "path": _binaries_dir / "genpolicy-linux",
-        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy3/genpolicy",
-        "sha256": "4cd497ca5e995ddacb53af4da47449c16291aea62e9f8b8ee0fe36ca8d41fe66",
+        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy4/genpolicy",
+        "sha256": "8ce7b6d93809c2c999845986784e75a114af5c29e880c5ac90522e856c49b546",
     },
     "Windows": {
         "path": _binaries_dir / "genpolicy-windows.exe",
@@ -36,12 +36,12 @@
 _kata_data = [
     {
         "path": _data_dir / "genpolicy-settings.json",
-        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy3/genpolicy-settings.json",  # pylint: disable=line-too-long
+        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy4/genpolicy-settings.json",  # pylint: disable=line-too-long
         "sha256": "c38be1474b133d49800a43bd30c40e7585b5f302179a307f9c6d89f195daee94",
     },
     {
         "path": _data_dir / "rules.rego",
-        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy3/rules.rego",
+        "url": "https://github.com/microsoft/kata-containers/releases/download/3.2.0.azl3.genpolicy4/rules.rego",
         "sha256": "2ca6c0e9617f97a922724112bd738fd73881d35b9ae5d31d573f0871d1ecf897",
     },
 ]

src/confcom/HISTORY.rst

@@ -2,6 +2,11 @@
 
 Release History
 ===============
+8.0.0
+++++++
+* Update control plane API to v2025-10-01-preview
+* Update data plane API to v2025-08-01-preview
+
 7.0.0
 ++++++
 * Update control plane API to v2025-04-01-preview

src/confcom/azext_confcom/kata_proxy.py

@@ -120,6 +120,22 @@
 "DevPool" --project-name "DevProject"
 """
 
+helps[
+    "devcenter dev pool align"
+] = """
+    type: command
+    short-summary: "Aligns all dev boxes in the pool with the current configuration."
+    examples:
+      - name: Align using dev center
+        text: |-
+               az devcenter dev pool align --dev-center-name "ContosoDevCenter" --name \
+"DevPool" --project-name "DevProject" --targets NetworkProperties HibernateSupport
+      - name: Align using endpoint
+        text: |-
+               az devcenter dev pool align --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" --name \
+"DevPool" --project-name "DevProject" --targets NetworkProperties HibernateSupport
+"""
+
 helps[
     "devcenter dev schedule"
 ] = """
@@ -421,11 +437,11 @@
       - name: Align using dev center
         text: |-
                az devcenter dev dev-box align --name "MyDevBox" --dev-center-name "ContosoDevCenter" \
---project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000"
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --targets NetworkProperties HibernateSupport
       - name: Align using endpoint
         text: |-
                az devcenter dev dev-box align --name "MyDevBox" --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
---project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000"
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --targets NetworkProperties HibernateSupport
 """
 
 helps[
@@ -453,11 +469,29 @@
       - name: Set active hours using dev center
         text: |-
                az devcenter dev dev-box set-active-hours --name "MyDevBox" --dev-center-name "ContosoDevCenter" \
---project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --time-zone "America/Los_Angeles" --start-time-hour "9" --end-time-hour "17"
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --time-zone "America/Los_Angeles" --start-time-hour "9" --end-time-hour "17" \
+--days-of-week Monday Tuesday Wednesday Thursday Friday
       - name: Set active hours using endpoint
         text: |-
                az devcenter dev dev-box set-active-hours --name "MyDevBox" --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
---project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --time-zone "America/Los_Angeles" --start-time-hour "9" --end-time-hour "17"
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --time-zone "America/Los_Angeles" --start-time-hour "9" --end-time-hour "17" \
+--days-of-week Monday Tuesday Wednesday Thursday Friday
+"""
+
+helps[
+    "devcenter dev dev-box schedule-delete"
+] = """
+    type: command
+    short-summary: "Creates an action to schedule the deletion of a dev box"
+    examples:
+      - name: Schedule delete using dev center
+        text: |-
+               az devcenter dev dev-box schedule-delete --name "MyDevBox" --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --delete-at "2027-12-31T23:59:00Z"
+      - name: Schedule delete using endpoint
+        text: |-
+               az devcenter dev dev-box schedule-delete --name "MyDevBox" --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --delete-at "2027-12-31T23:59:00Z"
 """
 
 helps[