remove change not relevant to connectedk8s release

Author: Bavneet Singh

src/k8s-extension/azext_k8s_extension/custom.py

@@ -763,7 +763,7 @@ def install_helm_client(cmd: CLICommand) -> str:
             "Downloading helm client for first time. This can take few minutes..."
         )
 
-        mcr_url = utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)
+        mcr_url = utils.get_mcr_path(cmd)
 
         client = oras.client.OrasClient(hostname=mcr_url)
         retry_count = 3

src/k8s-extension/azext_k8s_extension/utils.py

@@ -361,15 +361,11 @@ def create_folder_diagnosticlogs(folder_name: str, base_folder_name: str) -> tup
         )
         return "", False
 
-def get_mcr_path(active_directory_endpoint: str) -> str:
-    active_directory_array = active_directory_endpoint.split(".")
+def get_mcr_path(cmd: CLICommand) -> str:
+    active_directory_array = cmd.cli_ctx.cloud.endpoints.active_directory.split(".")
 
-    # For US Government and China clouds, use public mcr
-    if active_directory_endpoint.endswith((".us", ".cn")):
-        return "mcr.microsoft.com"
-
-    # Default MCR postfix
-    mcr_postfix = "com"
+    # default for public, mc, ff clouds
+    mcr_postfix = active_directory_array[2]
     # special cases for USSec, exclude part of suffix
     if len(active_directory_array) == 4 and active_directory_array[2] == "microsoft":
         mcr_postfix = active_directory_array[3]