From f61151c732ac22e62c0f9474f19dc9a4f1654b79 Mon Sep 17 00:00:00 2001 From: Jun Date: Thu, 21 Apr 2022 01:58:35 +0800 Subject: [PATCH] clusterip (#121) * clusterip * fix pr test Co-authored-by: Jun Min --- .../partner_extensions/AzureMLKubernetes.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py index 34eb3218de2..f985bec7541 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py @@ -334,9 +334,9 @@ def __normalize_config(self, configuration_settings, configuration_protected_set inferenceRouterServiceType = _get_value_from_config_protected_config( self.inferenceRouterServiceType, configuration_settings, configuration_protected_settings) if inferenceRouterServiceType: - if inferenceRouterServiceType.lower() != 'nodeport' and inferenceRouterServiceType.lower() != 'loadbalancer': + if not _is_valid_service_type(inferenceRouterServiceType): raise InvalidArgumentValueError( - "inferenceRouterServiceType only supports nodePort or loadBalancer." + "inferenceRouterServiceType only supports NodePort or LoadBalancer or ClusterIP." "Check https://aka.ms/arcmltsg for more information.") feIsNodePort = str(inferenceRouterServiceType).lower() == 'nodeport' @@ -424,10 +424,10 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p inferenceRouterServiceType = _get_value_from_config_protected_config( self.inferenceRouterServiceType, configuration_settings, configuration_protected_settings) - if not inferenceRouterServiceType or (inferenceRouterServiceType.lower() != 'nodeport' and inferenceRouterServiceType.lower() != 'loadbalancer'): + if not _is_valid_service_type(inferenceRouterServiceType): raise InvalidArgumentValueError( "To use inference, " - "please specify inferenceRouterServiceType=nodePort or inferenceRouterServiceType=loadBalancer in --configuration-settings and also set internalLoadBalancerProvider=azure if your aks only supports internal load balancer." + "please specify inferenceRouterServiceType=ClusterIP or inferenceRouterServiceType=NodePort or inferenceRouterServiceType=LoadBalancer in --configuration-settings and also set internalLoadBalancerProvider=azure if your aks only supports internal load balancer." "Check https://aka.ms/arcmltsg for more information.") feIsNodePort = str(inferenceRouterServiceType).lower() == 'nodeport' @@ -690,3 +690,10 @@ def _check_nodeselector_existed(configuration_settings, configuration_protected_ if "nodeSelector" in key: return True return False + + +def _is_valid_service_type(service_type): + if service_type: + return service_type.lower() == 'nodeport' or service_type.lower() == 'loadbalancer' or service_type.lower() == 'clusterip' + else: + return False