From 9f4393cb0b1a9f9e7aa53772bb719ccc3412abcc Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Thu, 22 Jul 2021 12:10:07 -0700 Subject: [PATCH 1/3] Adding a flag for AKS to AMLARC migration and set up corresponding FE helm values --- .../partner_extensions/AzureMLKubernetes.py | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 9f6aff45aac..7a45ba155db 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py @@ -82,6 +82,9 @@ def __init__(self): self.privateEndpointNodeport = 'privateEndpointNodeport' self.inferenceLoadBalancerHA = 'inferenceLoadBalancerHA' + # constants for existing AKS to AMLARC migration + self.IS_AKS_MIGRATION = 'isAKSMigration' + # reference mapping self.reference_mapping = { self.RELAY_SERVER_CONNECTION_STRING: [self.RELAY_CONNECTION_STRING_KEY, self.RELAY_CONNECTION_STRING_DEPRECATED_KEY], @@ -211,6 +214,13 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p configuration_settings['clusterPurpose'] = 'DevTest' else: configuration_settings['clusterPurpose'] = 'FastProd' + isAKSMigration = _get_value_from_config_protected_config( + self.IS_AKS_MIGRATION, configuration_settings, configuration_protected_settings) + isAKSMigration = str(isAKSMigration).lower() == 'true' + if isAKSMigration: + configuration_settings['scoringFe.namespace'] = "default" + configuration_settings['scoringFe.release-name'] = "scoring-fe-migration" + feIsNodePort = str(feIsNodePort).lower() == 'true' feSslCertFile = configuration_protected_settings.get(self.sslCertPemFile) feSslKeyFile = configuration_protected_settings.get(self.sslKeyPemFile) allowInsecureConnections = _get_value_from_config_protected_config( From 60783c7034e31081f5d68b1c790acd1cbde7f98c Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Thu, 22 Jul 2021 15:35:59 -0700 Subject: [PATCH 2/3] Remove one extra line --- .../azext_k8s_extension/partner_extensions/AzureMLKubernetes.py | 1 - 1 file changed, 1 deletion(-) 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 7a45ba155db..c1817fab18b 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py @@ -220,7 +220,6 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p if isAKSMigration: configuration_settings['scoringFe.namespace'] = "default" configuration_settings['scoringFe.release-name'] = "scoring-fe-migration" - feIsNodePort = str(feIsNodePort).lower() == 'true' feSslCertFile = configuration_protected_settings.get(self.sslCertPemFile) feSslKeyFile = configuration_protected_settings.get(self.sslKeyPemFile) allowInsecureConnections = _get_value_from_config_protected_config( From 438fa135d82bd08410ee1edadbd375fb2e1b3330 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Mon, 2 Aug 2021 13:09:06 -0700 Subject: [PATCH 3/3] Adding Scoring FE IS_AKS_MIGRATION check logic for helm values --- .../azext_k8s_extension/partner_extensions/AzureMLKubernetes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c1817fab18b..5f34fb4cbf7 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py @@ -219,7 +219,7 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p isAKSMigration = str(isAKSMigration).lower() == 'true' if isAKSMigration: configuration_settings['scoringFe.namespace'] = "default" - configuration_settings['scoringFe.release-name'] = "scoring-fe-migration" + configuration_settings[self.IS_AKS_MIGRATION] = "true" feSslCertFile = configuration_protected_settings.get(self.sslCertPemFile) feSslKeyFile = configuration_protected_settings.get(self.sslKeyPemFile) allowInsecureConnections = _get_value_from_config_protected_config(