Remove managed gateway API changes from cherry-picked istio commits

The cherry-picked App Routing Istio commits from PR #33254 share branch
ancestry with the Managed Gateway API changes from PR #33238. This commit
surgically removes the gateway-api-only code that came along, while
preserving the App Routing Istio functionality.

Removed:
- CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED/STANDARD constants
- enable_gateway_api / disable_gateway_api parameters and help entries
- set_up_ingress_profile_gateway_api / update_ingress_profile_gateway_api
  decorator methods
- Associated unit and integration tests

Kept:
- App Routing Istio (CONST_APP_ROUTING_ISTIO_MODE_*)
- gateway_api_implementations.app_routing_istio field handling

Author: Mauricio Ferrari

src/azure-cli/azure/cli/command_modules/acs/_consts.py

@@ -209,10 +209,6 @@
 CONST_APP_ROUTING_INTERNAL_NGINX = "Internal"
 CONST_APP_ROUTING_NONE_NGINX = "None"
 
-# managed gateway api installation
-CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED = "Disabled"
-CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD = "Standard"
-
 # app routing istio mode
 CONST_APP_ROUTING_ISTIO_MODE_ENABLED = "Enabled"
 CONST_APP_ROUTING_ISTIO_MODE_DISABLED = "Disabled"

src/azure-cli/azure/cli/command_modules/acs/_help.py

@@ -616,9 +616,6 @@
   - name: --enable-ai-toolchain-operator
     type: bool
     short-summary: Enable AI toolchain operator to 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.
   - name: --enable-app-routing-istio --enable-ari
     type: bool
     short-summary: Enable Gateway API based ingress on App Routing via Istio without service mesh functionality.
@@ -735,8 +732,6 @@
     text: az aks create -g MyResourceGroup -n MyManagedCluster --node-provisioning-mode Auto --node-provisioning-default-pools None
   - name: Create a Kubernetes cluster with KataVmIsolation enabled.
     text: az aks create -g MyResourceGroup -n MyManagedCluster --os-sku AzureLinux --vm-size Standard_D4s_v3 --workload-runtime KataVmIsolation --node-count 1
-  - 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
 """
 
 helps["aks update"] = """
@@ -1154,12 +1149,6 @@
   - name: --disable-ai-toolchain-operator
     type: bool
     short-summary: Disable AI toolchain operator.
-  - 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.
-  - name: --disable-gateway-api
-    type: bool
-    short-summary: Disable managed installation of Gateway API CRDs.
   - name: --enable-app-routing-istio --enable-ari
     type: bool
     short-summary: Enable Gateway API based ingress on App Routing via Istio without service mesh functionality.
@@ -1258,10 +1247,6 @@
     text: az aks update -g MyResourceGroup -n MyManagedCluster --node-provisioning-mode Auto --node-provisioning-default-pools None
   - name: Upgrade load balancer sku to standard
     text: az aks update --load-balancer-sku standard -g MyResourceGroup -n MyManagedCluster
-  - name: Update a kubernetes cluster to enable a managed installation of Gateway API CRDs from the standard release channel.
-    text: az aks update -g MyResourceGroup -n MyManagedCluster --enable-gateway-api
-  - name: Update a kubernetes cluster to disable the managed installation of Gateway API CRDs.
-    text: az aks update -g MyResourceGroup -n MyManagedCluster --disable-gateway-api
 """
 
 helps["aks delete"] = """

src/azure-cli/azure/cli/command_modules/acs/_params.py

@@ -650,12 +650,6 @@ def load_arguments(self, _):
                 'by that action.'
             )
         )
-        c.argument(
-            "enable_gateway_api",
-            action="store_true",
-            help="Enable managed installation of Gateway API CRDs from the standard release channel. "
-                 "Requires a Gateway API implementation to be installed on the cluster (e.g., Azure Service Mesh)."
-        )
         c.argument(
             "enable_app_routing_istio",
             options_list=["--enable-app-routing-istio", "--enable-ari"],
@@ -885,17 +879,6 @@ def load_arguments(self, _):
                 'by that action.'
             )
         )
-        c.argument(
-            "enable_gateway_api",
-            action="store_true",
-            help="Enable managed installation of Gateway API CRDs from the standard release channel. "
-                 "Requires a Gateway API implementation to be installed on the cluster (e.g., Azure Service Mesh)."
-        )
-        c.argument(
-            "disable_gateway_api",
-            action="store_true",
-            help="Disable managed installation of Gateway API CRDs."
-        )
         c.argument(
             "enable_app_routing_istio",
             options_list=["--enable-app-routing-istio", "--enable-ari"],

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -1035,8 +1035,6 @@ def aks_create(
     # node provisioning
     node_provisioning_mode=None,
     node_provisioning_default_pools=None,
-    # gateway api
-    enable_gateway_api=False,
     # app routing istio
     enable_app_routing_istio=False,
 ):
@@ -1232,9 +1230,6 @@ def aks_update(
     # node provisioning
     node_provisioning_mode=None,
     node_provisioning_default_pools=None,
-    # gateway api
-    enable_gateway_api=False,
-    disable_gateway_api=False,
     # app routing istio
     enable_app_routing_istio=False,
     disable_app_routing_istio=False,

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -50,8 +50,6 @@
     CONST_VIRTUAL_MACHINES,
     CONST_ACNS_DATAPATH_ACCELERATION_MODE_BPFVETH,
     CONST_ACNS_DATAPATH_ACCELERATION_MODE_NONE,
-    CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED,
-    CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD,
     CONST_APP_ROUTING_ISTIO_MODE_ENABLED,
     CONST_APP_ROUTING_ISTIO_MODE_DISABLED,
 )
@@ -5977,20 +5975,6 @@ def get_node_provisioning_default_pools(self) -> Union[str, None]:
         """
         return self.raw_param.get("node_provisioning_default_pools")
 
-    def get_enable_gateway_api(self) -> bool:
-        """Obtain the value of enable_gateway_api.
-
-        :return: bool
-        """
-        return self.raw_param.get("enable_gateway_api", False)
-
-    def get_disable_gateway_api(self) -> bool:
-        """Obtain the value of disable_gateway_api.
-
-        :return: bool
-        """
-        return self.raw_param.get("disable_gateway_api", False)
-
     def get_enable_app_routing_istio(self) -> bool:
         """Obtain the value of enable_app_routing_istio.
 
@@ -7394,19 +7378,6 @@ def set_up_ingress_web_app_routing(self, mc: ManagedCluster) -> ManagedCluster:
 
         return mc
 
-    def set_up_ingress_profile_gateway_api(self, mc: ManagedCluster) -> ManagedCluster:
-        self._ensure_mc(mc)
-        if self.context.get_enable_gateway_api():
-            if mc.ingress_profile is None:
-                mc.ingress_profile = self.models.ManagedClusterIngressProfile()
-            if mc.ingress_profile.gateway_api is None:
-                mc.ingress_profile.gateway_api = (
-                    self.models.ManagedClusterIngressProfileGatewayConfiguration(
-                        installation=CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD
-                    )
-                )
-        return mc
-
     def set_up_ingress_profile_app_routing_istio(self, mc: ManagedCluster) -> ManagedCluster:
         """Set up App Routing Istio configuration in ingress profile for the ManagedCluster object.
 
@@ -7585,8 +7556,6 @@ def construct_mc_profile_default(self, bypass_restore_defaults: bool = False) ->
         mc = self.set_up_workload_auto_scaler_profile(mc)
         # set up app routing profile
         mc = self.set_up_ingress_web_app_routing(mc)
-        # set up gateway api
-        mc = self.set_up_ingress_profile_gateway_api(mc)
         # set up app routing istio
         mc = self.set_up_ingress_profile_app_routing_istio(mc)
         # set up custom ca trust certificates
@@ -9086,31 +9055,6 @@ def _update_app_routing_nginx(self, mc: ManagedCluster, nginx) -> None:
         else:
             raise CLIError('App Routing must be enabled to modify the default nginx ingress controller.\n')
 
-    def update_ingress_profile_gateway_api(self, mc: ManagedCluster) -> ManagedCluster:
-        """Update gateway api installation in the ingress profile for the ManagedCluster object.
-
-        :return: the ManagedCluster object
-        """
-        self._ensure_mc(mc)
-        enable_gateway_api = self.context.get_enable_gateway_api()
-        disable_gateway_api = self.context.get_disable_gateway_api()
-        if enable_gateway_api and disable_gateway_api:
-            raise MutuallyExclusiveArgumentError(
-                "Cannot specify --enable-gateway-api and --disable-gateway-api at the same time."
-            )
-        if enable_gateway_api or disable_gateway_api:
-            if mc.ingress_profile is None:
-                mc.ingress_profile = self.models.ManagedClusterIngressProfile()  # pylint: disable=no-member
-            if mc.ingress_profile.gateway_api is None:
-                mc.ingress_profile.gateway_api = (
-                    self.models.ManagedClusterIngressProfileGatewayConfiguration()  # pylint: disable=no-member
-                )
-            if enable_gateway_api:
-                mc.ingress_profile.gateway_api.installation = CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD
-            elif disable_gateway_api:
-                mc.ingress_profile.gateway_api.installation = CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED
-        return mc
-
     def update_ingress_profile_app_routing_istio(self, mc: ManagedCluster) -> ManagedCluster:
         """Update App Routing Istio configuration in ingress profile for the ManagedCluster object.
 
@@ -10065,8 +10009,6 @@ def update_mc_profile_default(self) -> ManagedCluster:
         mc = self.update_node_resource_group_profile(mc)
         # update AI toolchain operator
         mc = self.update_ai_toolchain_operator(mc)
-        # update gateway api
-        mc = self.update_ingress_profile_gateway_api(mc)
         # update app routing istio
         mc = self.update_ingress_profile_app_routing_istio(mc)
         # update bootstrap profile

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

@@ -15052,138 +15052,6 @@ def test_aks_nodepool_add_with_localdns_required_mode(self, resource_group, reso
             checks=[self.is_empty()],
         )
 
-    @AllowLargeResponse()
-    @AKSCustomResourceGroupPreparer(
-        random_name_length=17, name_prefix="clitest", location="centraluseuap"
-    )
-    def test_aks_create_with_gateway_api_and_azureservicemesh(
-        self, resource_group, resource_group_location
-    ):
-        # 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)
-        _, create_version = self._get_versions(resource_group_location)
-        asm_revision = self._get_asm_supported_revision(resource_group_location)
-        self.kwargs.update(
-            {
-                "resource_group": resource_group,
-                "name": aks_name,
-                "ssh_key_value": self.generate_ssh_keys(),
-                "k8s_version": create_version,
-                "asm_revision": asm_revision,
-            }
-        )
-
-        # Test successful creation with Gateway API and Azure Service Mesh addon
-        create_cmd = (
-            "aks create --resource-group={resource_group} --name={name} "
-            "--enable-azure-service-mesh "
-            "--enable-gateway-api "
-            "--ssh-key-value={ssh_key_value} -o json "
-        )
-        self.cmd(
-            create_cmd,
-            checks=[
-                self.check("provisioningState", "Succeeded"),
-                self.check("serviceMeshProfile.mode", "Istio"),
-                self.check("ingressProfile.gatewayApi.installation", "Standard"),
-            ],
-        )
-
-        # Test disabling Gateway API
-        update_cmd = (
-            "aks update --resource-group={resource_group} --name={name} "
-            "--disable-gateway-api "
-        )
-        self.cmd(
-            update_cmd,
-            checks=[
-                self.check("provisioningState", "Succeeded"),
-                self.check("ingressProfile.gatewayApi.installation", "Disabled"),
-            ],
-        )
-
-        # Test re-enabling Gateway API
-        update_cmd = (
-            "aks update --resource-group={resource_group} --name={name} "
-            "--enable-gateway-api "
-        )
-        self.cmd(
-            update_cmd,
-            checks=[
-                self.check("provisioningState", "Succeeded"),
-                self.check("ingressProfile.gatewayApi.installation", "Standard"),
-            ],
-        )
-
-        # Cleanup
-        self.cmd(
-            "aks delete --resource-group={resource_group} --name={name} --yes --no-wait",
-            checks=[self.is_empty()],
-        )
-
-
-    @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 "
-        )
-        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 "
-        )
-        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()])
-
     @AllowLargeResponse()
     @AKSCustomResourceGroupPreparer(
         random_name_length=17, name_prefix="clitest", location="centraluseuap"