|
50 | 50 | CONST_VIRTUAL_MACHINES, |
51 | 51 | CONST_ACNS_DATAPATH_ACCELERATION_MODE_BPFVETH, |
52 | 52 | CONST_ACNS_DATAPATH_ACCELERATION_MODE_NONE, |
53 | | - CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED, |
54 | | - CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD, |
55 | 53 | CONST_APP_ROUTING_ISTIO_MODE_ENABLED, |
56 | 54 | CONST_APP_ROUTING_ISTIO_MODE_DISABLED, |
57 | 55 | ) |
@@ -6037,20 +6035,6 @@ def get_node_provisioning_default_pools(self) -> Union[str, None]: |
6037 | 6035 | """ |
6038 | 6036 | return self.raw_param.get("node_provisioning_default_pools") |
6039 | 6037 |
|
6040 | | - def get_enable_gateway_api(self) -> bool: |
6041 | | - """Obtain the value of enable_gateway_api. |
6042 | | -
|
6043 | | - :return: bool |
6044 | | - """ |
6045 | | - return self.raw_param.get("enable_gateway_api", False) |
6046 | | - |
6047 | | - def get_disable_gateway_api(self) -> bool: |
6048 | | - """Obtain the value of disable_gateway_api. |
6049 | | -
|
6050 | | - :return: bool |
6051 | | - """ |
6052 | | - return self.raw_param.get("disable_gateway_api", False) |
6053 | | - |
6054 | 6038 | def get_enable_app_routing_istio(self) -> bool: |
6055 | 6039 | """Obtain the value of enable_app_routing_istio. |
6056 | 6040 |
|
@@ -7464,19 +7448,6 @@ def set_up_ingress_web_app_routing(self, mc: ManagedCluster) -> ManagedCluster: |
7464 | 7448 |
|
7465 | 7449 | return mc |
7466 | 7450 |
|
7467 | | - def set_up_ingress_profile_gateway_api(self, mc: ManagedCluster) -> ManagedCluster: |
7468 | | - self._ensure_mc(mc) |
7469 | | - if self.context.get_enable_gateway_api(): |
7470 | | - if mc.ingress_profile is None: |
7471 | | - mc.ingress_profile = self.models.ManagedClusterIngressProfile() |
7472 | | - if mc.ingress_profile.gateway_api is None: |
7473 | | - mc.ingress_profile.gateway_api = ( |
7474 | | - self.models.ManagedClusterIngressProfileGatewayConfiguration( |
7475 | | - installation=CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD |
7476 | | - ) |
7477 | | - ) |
7478 | | - return mc |
7479 | | - |
7480 | 7451 | def set_up_ingress_profile_app_routing_istio(self, mc: ManagedCluster) -> ManagedCluster: |
7481 | 7452 | """Set up App Routing Istio configuration in ingress profile for the ManagedCluster object. |
7482 | 7453 |
|
@@ -7655,8 +7626,6 @@ def construct_mc_profile_default(self, bypass_restore_defaults: bool = False) -> |
7655 | 7626 | mc = self.set_up_workload_auto_scaler_profile(mc) |
7656 | 7627 | # set up app routing profile |
7657 | 7628 | mc = self.set_up_ingress_web_app_routing(mc) |
7658 | | - # set up gateway api |
7659 | | - mc = self.set_up_ingress_profile_gateway_api(mc) |
7660 | 7629 | # set up app routing istio |
7661 | 7630 | mc = self.set_up_ingress_profile_app_routing_istio(mc) |
7662 | 7631 | # set up custom ca trust certificates |
@@ -9156,31 +9125,6 @@ def _update_app_routing_nginx(self, mc: ManagedCluster, nginx) -> None: |
9156 | 9125 | else: |
9157 | 9126 | raise CLIError('App Routing must be enabled to modify the default nginx ingress controller.\n') |
9158 | 9127 |
|
9159 | | - def update_ingress_profile_gateway_api(self, mc: ManagedCluster) -> ManagedCluster: |
9160 | | - """Update gateway api installation in the ingress profile for the ManagedCluster object. |
9161 | | -
|
9162 | | - :return: the ManagedCluster object |
9163 | | - """ |
9164 | | - self._ensure_mc(mc) |
9165 | | - enable_gateway_api = self.context.get_enable_gateway_api() |
9166 | | - disable_gateway_api = self.context.get_disable_gateway_api() |
9167 | | - if enable_gateway_api and disable_gateway_api: |
9168 | | - raise MutuallyExclusiveArgumentError( |
9169 | | - "Cannot specify --enable-gateway-api and --disable-gateway-api at the same time." |
9170 | | - ) |
9171 | | - if enable_gateway_api or disable_gateway_api: |
9172 | | - if mc.ingress_profile is None: |
9173 | | - mc.ingress_profile = self.models.ManagedClusterIngressProfile() # pylint: disable=no-member |
9174 | | - if mc.ingress_profile.gateway_api is None: |
9175 | | - mc.ingress_profile.gateway_api = ( |
9176 | | - self.models.ManagedClusterIngressProfileGatewayConfiguration() # pylint: disable=no-member |
9177 | | - ) |
9178 | | - if enable_gateway_api: |
9179 | | - mc.ingress_profile.gateway_api.installation = CONST_MANAGED_GATEWAY_INSTALLATION_STANDARD |
9180 | | - elif disable_gateway_api: |
9181 | | - mc.ingress_profile.gateway_api.installation = CONST_MANAGED_GATEWAY_INSTALLATION_DISABLED |
9182 | | - return mc |
9183 | | - |
9184 | 9128 | def update_ingress_profile_app_routing_istio(self, mc: ManagedCluster) -> ManagedCluster: |
9185 | 9129 | """Update App Routing Istio configuration in ingress profile for the ManagedCluster object. |
9186 | 9130 |
|
@@ -10156,8 +10100,6 @@ def update_mc_profile_default(self) -> ManagedCluster: |
10156 | 10100 | mc = self.update_node_resource_group_profile(mc) |
10157 | 10101 | # update AI toolchain operator |
10158 | 10102 | mc = self.update_ai_toolchain_operator(mc) |
10159 | | - # update gateway api |
10160 | | - mc = self.update_ingress_profile_gateway_api(mc) |
10161 | 10103 | # update app routing istio |
10162 | 10104 | mc = self.update_ingress_profile_app_routing_istio(mc) |
10163 | 10105 | # update bootstrap profile |
|
0 commit comments