[connectedk8s] Update extension CLI to v1.10.11 (Azure#9304)

bavneetsingh16 · Bavneet Singh · atchutbarli · web-flow · commit 425351566b46 · 2025-10-16T10:10:19.000+08:00
* add pester tests for connectedk8s cli extension * Pass the force delete param to the API call (#4) * forcedelete * format * add code owner * mypy * fix CI testcases for nodepool image issues (#8) * update python version to 3.13 (#12) * changes to support gateway association/disassociation for api version '2025-08-01-preview' (#17) * [Azure RBAC] Deprecate 3P mode flags, fix Azure RBAC enablement bug, add E2E coverage and improve logging (#20) * add pester tests for connectedk8s cli extension * Pass the force delete param to the API call (#4) * forcedelete * format * add code owner * mypy * Parameterize for airgapped clouds (#5) * Add parameterization for the airgapped clouds * Fix azdev style * MCR path function * azdev, ruff, and mypy --------- Co-authored-by: Matthew McNeal (from Dev Box) <mmcneal@microsoft.com> * Oras client fix to work with different MCRs (#6) Co-authored-by: mmcneal <mmcneal@microsoft.com> * fix CI testcases for nodepool image issues (#8) * update errors for the config and connectivity issues (#11) * update errors * format * style * update python version to 3.13 (#12) * Update cluster diagnostics image to 1.29.3 (#7) * Update cluster diagnostics helm chart to 1.29.3 * Fix lint issues --------- Co-authored-by: bgriddaluru <bharath.griddaluru@microsoft.com> * RBAC deprecation & fix the issue * typo * fix comments * update tests * add pester tests for connectedk8s cli extension * Pass the force delete param to the API call (#4) * forcedelete * format * add code owner * mypy * fix CI testcases for nodepool image issues (#8) * update errors for the config and connectivity issues (#11) * update errors * format * style * update python version to 3.13 (#12) * rebase * fix tests * fix version * fix mypy, lint * fix test * fix test * fix test * fix test * fix test * rename test * deprecate flags * rebase * rebase * bump version for release --------- Co-authored-by: Bavneet Singh <bavneetsingh@microsoft.com> Co-authored-by: Atchut Kumar Barli <atchut@gmail.com> Co-authored-by: mcnealm13 <57726243+mcnealm13@users.noreply.github.com> Co-authored-by: Matthew McNeal (from Dev Box) <mmcneal@microsoft.com> Co-authored-by: Bavneet Singh <33008256+bavneetsingh16@users.noreply.github.com> Co-authored-by: bgriddaluru <117554445+bgriddaluru@users.noreply.github.com> Co-authored-by: bgriddaluru <bharath.griddaluru@microsoft.com> Co-authored-by: vithumma <vithumma@microsoft.com> * remove hardcoded public ARM endpoint url for fairfax and mooncake (#24) * Bug Fix for FFX mcr url (#22) * [connectedk8s] update release notes and version (#26) * remove redundant test files * remove change not relevant to connectedk8s release --------- Co-authored-by: Bavneet Singh <bavneetsingh@microsoft.com> Co-authored-by: Atchut Kumar Barli <atchut@gmail.com> Co-authored-by: Vineeth Thumma <vineeth-thumma@users.noreply.github.com> Co-authored-by: mcnealm13 <57726243+mcnealm13@users.noreply.github.com> Co-authored-by: Matthew McNeal (from Dev Box) <mmcneal@microsoft.com> Co-authored-by: bgriddaluru <117554445+bgriddaluru@users.noreply.github.com> Co-authored-by: bgriddaluru <bharath.griddaluru@microsoft.com> Co-authored-by: vithumma <vithumma@microsoft.com> Co-authored-by: hapate <hapate@microsoft.com>
diff --git a/src/connectedk8s/HISTORY.rst b/src/connectedk8s/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+1.10.11
++++++++
+* Removed hardcoded public ARM endpoint URL for Government clouds.
+* Fixed incorrect MCR endpoint URLs for Government cloud environments.
+
 1.10.10
 +++++
 * Deprecated '--app-id' and '--app-secret' RBAC parameters from the extension by adding them to _breaking_change.py.
diff --git a/src/connectedk8s/azext_connectedk8s/_client_factory.py b/src/connectedk8s/azext_connectedk8s/_client_factory.py
@@ -83,15 +83,13 @@ def cf_connectedk8s_prev_2025_08_01(
             KubernetesClient,
             subscription_id=os.getenv("AZURE_SUBSCRIPTION_ID"),
             credential=credential,
-            base_url="https://management.azure.com",
             per_call_policies=[headers_policy],
         )
         return client
 
     client = get_mgmt_service_client(
         cli_ctx,
         KubernetesClient,
-        base_url="https://management.azure.com",
         per_call_policies=[headers_policy],
     )
     return client
diff --git a/src/connectedk8s/azext_connectedk8s/_precheckutils.py b/src/connectedk8s/azext_connectedk8s/_precheckutils.py
@@ -212,7 +212,7 @@ def executing_cluster_diagnostic_checks_job(
                     )
                     return None
 
-        mcr_url = azext_utils.get_mcr_path(cmd)
+        mcr_url = azext_utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)
 
         chart_path = azext_utils.get_chart_path(
             f"{mcr_url}/{consts.Cluster_Diagnostic_Checks_Job_Registry_Path}",
diff --git a/src/connectedk8s/azext_connectedk8s/_utils.py b/src/connectedk8s/azext_connectedk8s/_utils.py
@@ -58,11 +58,15 @@
 # pylint: disable=bare-except
 
 
-def get_mcr_path(cmd: CLICommand) -> str:
-    active_directory_array = cmd.cli_ctx.cloud.endpoints.active_directory.split(".")
+def get_mcr_path(active_directory_endpoint: str) -> str:
+    active_directory_array = active_directory_endpoint.split(".")
 
-    # default for public, mc, ff clouds
-    mcr_postfix = active_directory_array[2]
+    # 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"
     # 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]
diff --git a/src/connectedk8s/azext_connectedk8s/clientproxyhelper/_binaryutils.py b/src/connectedk8s/azext_connectedk8s/clientproxyhelper/_binaryutils.py
@@ -76,7 +76,7 @@ def _download_proxy_from_MCR(
     operating_system: str,
     architecture: str,
 ) -> None:
-    mcr_url = utils.get_mcr_path(cmd)
+    mcr_url = utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)
 
     mar_target = f"{mcr_url}/{consts.CLIENT_PROXY_MCR_TARGET}/{operating_system.lower()}/{architecture}/arc-proxy"
     logger.debug(
diff --git a/src/connectedk8s/azext_connectedk8s/custom.py b/src/connectedk8s/azext_connectedk8s/custom.py
@@ -1318,7 +1318,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)
+        mcr_url = utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)
 
         client = oras.client.OrasClient(hostname=mcr_url)
         retry_count = 3
diff --git a/src/connectedk8s/azext_connectedk8s/tests/unittests/test_utils_.py b/src/connectedk8s/azext_connectedk8s/tests/unittests/test_utils_.py
@@ -9,6 +9,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")))
 from azext_connectedk8s._utils import (
+    get_mcr_path,
     process_helm_error_detail,
     redact_sensitive_fields_from_string,
     remove_rsa_private_key,
@@ -76,5 +77,27 @@ def test_redact_sensitive_fields_from_string():
     )
 
 
+def test_get_mcr_path():
+    input_active_directory = "login.microsoftonline.com"
+    expected_output = "mcr.microsoft.com"
+    assert get_mcr_path(input_active_directory) == expected_output
+
+    input_active_directory = "login.microsoftonline.us"
+    expected_output = "mcr.microsoft.com"
+    assert get_mcr_path(input_active_directory) == expected_output
+
+    input_active_directory = "login.chinacloudapi.cn"
+    expected_output = "mcr.microsoft.com"
+    assert get_mcr_path(input_active_directory) == expected_output
+
+    input_active_directory = "https://login.microsoftonline.microsoft.foo"
+    expected_output = "mcr.microsoft.foo"
+    assert get_mcr_path(input_active_directory) == expected_output
+
+    input_active_directory = "https://login.microsoftonline.some.cloud.bar"
+    expected_output = "mcr.microsoft.some.cloud.bar"
+    assert get_mcr_path(input_active_directory) == expected_output
+
+
 if __name__ == "__main__":
     pytest.main()
diff --git a/src/connectedk8s/setup.py b/src/connectedk8s/setup.py
@@ -13,7 +13,7 @@
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
 
-VERSION = "1.10.10"
+VERSION = "1.10.11"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ def executing_cluster_diagnostic_checks_job(`
`212`	`212`	`)`
`213`	`213`	`return None`
`214`	`214`
`215`		`- mcr_url = azext_utils.get_mcr_path(cmd)`
	`215`	`+ mcr_url = azext_utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)`
`216`	`216`
`217`	`217`	`chart_path = azext_utils.get_chart_path(`
`218`	`218`	`f"{mcr_url}/{consts.Cluster_Diagnostic_Checks_Job_Registry_Path}",`
Original file line number	Diff line number	Diff line change
`@@ -1318,7 +1318,7 @@ def install_helm_client(cmd: CLICommand) -> str:`
`1318`	`1318`	`"Downloading helm client for first time. This can take few minutes..."`
`1319`	`1319`	`)`
`1320`	`1320`
`1321`		`- mcr_url = utils.get_mcr_path(cmd)`
	`1321`	`+ mcr_url = utils.get_mcr_path(cmd.cli_ctx.cloud.endpoints.active_directory)`
`1322`	`1322`
`1323`	`1323`	`client = oras.client.OrasClient(hostname=mcr_url)`
`1324`	`1324`	`retry_count = 3`