Parameterize for the Airgapped Clouds

src/connectedk8s/azext_connectedk8s/_constants.py

@@ -63,13 +63,13 @@
 AHB_Enum_Values = ["True", "False", "NotApplicable"]
 Feature_Values = ["cluster-connect", "azure-rbac", "custom-locations"]
 CRD_FOR_FORCE_DELETE = [
-    "arccertificates.clusterconfig.azure.com",
-    "azureclusteridentityrequests.clusterconfig.azure.com",
-    "azureextensionidentities.clusterconfig.azure.com",
-    "connectedclusters.arc.azure.com",
-    "customlocationsettings.clusterconfig.azure.com",
-    "extensionconfigs.clusterconfig.azure.com",
-    "gitconfigs.clusterconfig.azure.com",
+    "arccertificates.clusterconfig.azure",
+    "azureclusteridentityrequests.clusterconfig.azure",
+    "azureextensionidentities.clusterconfig.azure",
+    "connectedclusters.arc.azure",
+    "customlocationsettings.clusterconfig.azure",
+    "extensionconfigs.clusterconfig.azure",
+    "gitconfigs.clusterconfig.azure",
 ]
 Helm_Install_Release_Userfault_Messages = [
     "forbidden",
@@ -418,7 +418,7 @@
 
 # Connect Precheck Diagnoser constants
 Cluster_Diagnostic_Checks_Job_Registry_Path = (
-    "mcr.microsoft.com/azurearck8s/helmchart/stable/clusterdiagnosticchecks:0.2.2"
+    "azurearck8s/helmchart/stable/clusterdiagnosticchecks:0.2.2"
 )
 Cluster_Diagnostic_Checks_Helm_Install_Failed_Fault_Type = (
     "Error while installing cluster diagnostic checks helm release"
@@ -481,8 +481,8 @@
 DEFAULT_MAX_ONBOARDING_TIMEOUT_HELMVALUE_SECONDS = "1200"
 
 # URL constants
-CLIENT_PROXY_MCR_TARGET = "mcr.microsoft.com/azureconnectivity/proxy"
-HELM_MCR_URL = "mcr.microsoft.com/azurearck8s/helm"
+CLIENT_PROXY_MCR_TARGET = "azureconnectivity/proxy"
+HELM_MCR_URL = "azurearck8s/helm"
 HELM_VERSION = "v3.12.2"
 Download_And_Install_Kubectl_Fault_Type = "Failed to download and install kubectl"
 Azure_Access_Token_Variable = "AZURE_ACCESS_TOKEN"

src/connectedk8s/azext_connectedk8s/_precheckutils.py

@@ -21,6 +21,7 @@
 
 if TYPE_CHECKING:
     from kubernetes.client import BatchV1Api, CoreV1Api
+    from knack.commands import CLICommand
 
 logger = get_logger(__name__)
 # pylint: disable=unused-argument, too-many-locals, too-many-branches, too-many-statements, line-too-long
@@ -30,6 +31,7 @@
 
 
 def fetch_diagnostic_checks_results(
+    cmd: CLICommand,
     corev1_api_instance: CoreV1Api,
     batchv1_api_instance: BatchV1Api,
     helm_client_location: str,
@@ -52,6 +54,7 @@ def fetch_diagnostic_checks_results(
         # Executing the cluster_diagnostic_checks job and fetching the logs obtained
         cluster_diagnostic_checks_container_log = (
             executing_cluster_diagnostic_checks_job(
+                cmd,
                 corev1_api_instance,
                 batchv1_api_instance,
                 helm_client_location,
@@ -135,6 +138,7 @@ def fetch_diagnostic_checks_results(
 
 
 def executing_cluster_diagnostic_checks_job(
+    cmd: CLICommand,
     corev1_api_instance: CoreV1Api,
     batchv1_api_instance: BatchV1Api,
     helm_client_location: str,
@@ -208,8 +212,21 @@ def executing_cluster_diagnostic_checks_job(
                     )
                     return None
 
+        active_directory_array = cmd.cli_ctx.cloud.endpoints.active_directory.split(".")
+
+        # 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]
+        # special case for USNat
+        elif len(active_directory_array) == 5:
+            mcr_postfix = active_directory_array[2] + "." + active_directory_array[3] + "." + active_directory_array[4]
+
+        mcr_url = f"mcr.microsoft.{mcr_postfix}"
+
         chart_path = azext_utils.get_chart_path(
-            consts.Cluster_Diagnostic_Checks_Job_Registry_Path,
+            f"{mcr_url}/{consts.Cluster_Diagnostic_Checks_Job_Registry_Path}",
             kube_config,
             kube_context,
             helm_client_location,

src/connectedk8s/azext_connectedk8s/clientproxyhelper/_binaryutils.py

@@ -13,6 +13,7 @@
 from azure.cli.core import azclierror, telemetry
 from azure.cli.core.style import Style, print_styled_text
 from knack import log
+from knack.commands import CLICommand
 
 import azext_connectedk8s._constants as consts
 import azext_connectedk8s._fileutils as file_utils
@@ -22,6 +23,7 @@
 
 # Downloads client side proxy to connect to Arc Connectivity Platform
 def install_client_side_proxy(
+    cmd: CLICommand,
     arc_proxy_folder: Optional[str], debug: bool = False
 ) -> str:
     client_operating_system = _get_client_operating_system()
@@ -48,7 +50,7 @@ def install_client_side_proxy(
                     )
 
             _download_proxy_from_MCR(
-                install_dir, proxy_name, client_operating_system, client_architecture
+                cmd, install_dir, proxy_name, client_operating_system, client_architecture
             )
             _check_proxy_installation(install_dir, proxy_name, debug)
 
@@ -64,9 +66,23 @@ def install_client_side_proxy(
 
 
 def _download_proxy_from_MCR(
-    dest_dir: str, proxy_name: str, operating_system: str, architecture: str
+    cmd: CLICommand, dest_dir: str, proxy_name: str, operating_system: str, architecture: str
 ) -> None:
-    mar_target = f"{consts.CLIENT_PROXY_MCR_TARGET}/{operating_system.lower()}/{architecture}/arc-proxy"
+
+    active_directory_array = cmd.cli_ctx.cloud.endpoints.active_directory.split(".")
+
+    # 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]
+    # special case for USNat
+    elif len(active_directory_array) == 5:
+        mcr_postfix = active_directory_array[2] + "." + active_directory_array[3] + "." + active_directory_array[4]
+
+    mcr_url = f"mcr.microsoft.{mcr_postfix}"
+
+    mar_target = f"{mcr_url}/{consts.CLIENT_PROXY_MCR_TARGET}/{operating_system.lower()}/{architecture}/arc-proxy"
     logger.debug(
         "Downloading Arc Connectivity Proxy from %s in Microsoft Artifact Regristy.",
         mar_target,

src/connectedk8s/azext_connectedk8s/clientproxyhelper/_proxylogic.py

@@ -18,7 +18,7 @@
 if TYPE_CHECKING:
     from subprocess import Popen
 
-    from knack.commands import CLICommmand
+    from knack.commands import CLICommand
     from requests.models import Response
 
     from azext_connectedk8s.vendored_sdks.preview_2024_07_01.models import (
@@ -30,7 +30,7 @@
 
 
 def handle_post_at_to_csp(
-    cmd: CLICommmand,
+    cmd: CLICommand,
     api_server_port: int,
     tenant_id: str,
     clientproxy_process: Popen[bytes],