resolve conflicts

Author: Jianping Zeng

src/aks-preview/HISTORY.rst

@@ -12,10 +12,18 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
-18.0.0b7
+18.0.0b9
 +++++++
 * Add `--max-blocked-nodes` to the `az aks nodepool add/update/upgrade` commands.
 
+18.0.0b8
++++++++
+* Populate location of managed namespaces using managed cluster's location
+
+18.0.0b7
++++++++
+* Add option `--disable-http-proxy` to `az aks update`.
+
 18.0.0b6
 +++++++
 * Quality improvements for `az aks extension` and `az aks extension type` command groups

src/aks-preview/azext_aks_preview/_help.py

@@ -1262,6 +1262,9 @@
         - name: --migrate-vmas-to-vms
           type: bool
           short-summary: Migrate cluster with VMAS node pool to VMS node pool.
+        - name: --disable-http-proxy
+          type: bool
+          short-summary: Disable HTTP Proxy Configuration on the cluster.
     examples:
       - name: Reconcile the cluster back to its current state.
         text: az aks update -g MyResourceGroup -n MyManagedCluster

src/aks-preview/azext_aks_preview/_params.py

@@ -1444,6 +1444,7 @@ def load_arguments(self, _):
         )
 
         c.argument('migrate_vmas_to_vms', is_preview=True, action='store_true')
+        c.argument("disable_http_proxy", action="store_true", is_preview=True)
 
     with self.argument_context("aks upgrade") as c:
         c.argument("kubernetes_version", completer=get_k8s_upgrades_completion_list)

src/aks-preview/azext_aks_preview/custom.py

@@ -822,6 +822,7 @@ def aks_update(
     azure_keyvault_kms_key_vault_network_access=None,
     azure_keyvault_kms_key_vault_resource_id=None,
     http_proxy_config=None,
+    disable_http_proxy=False,
     bootstrap_artifact_source=None,
     bootstrap_container_registry_resource_id=None,
     # addons

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -2839,6 +2839,16 @@ def get_migrate_vmas_to_vms(self) -> bool:
         """
         return self.raw_param.get("migrate_vmas_to_vms")
 
+    def get_disable_http_proxy(self) -> bool:
+        """Obtain the value of disable_http_proxy.
+
+        :return: bool
+        """
+        # read the original value passed by the command
+        disable_http_proxy = self.raw_param.get("disable_http_proxy")
+
+        return disable_http_proxy
+
 
 # pylint: disable=too-many-public-methods
 class AKSPreviewManagedClusterCreateDecorator(AKSManagedClusterCreateDecorator):
@@ -5322,6 +5332,22 @@ def update_vmas_to_vms(self, mc: ManagedCluster) -> ManagedCluster:
 
         return mc
 
+    def update_http_proxy_enabled(self, mc: ManagedCluster) -> ManagedCluster:
+        """Update http proxy config for the ManagedCluster object.
+
+        :return: the ManagedCluster object
+        """
+        self._ensure_mc(mc)
+
+        if self.context.get_disable_http_proxy():
+            if mc.http_proxy_config is None:
+                mc.http_proxy_config = (
+                    self.models.ManagedClusterHTTPProxyConfig()  # pylint: disable=no-member
+                )
+            mc.http_proxy_config.enabled = False
+
+        return mc
+
     def update_mc_profile_preview(self) -> ManagedCluster:
         """The overall controller used to update the preview ManagedCluster profile.
 
@@ -5397,6 +5423,8 @@ def update_mc_profile_preview(self) -> ManagedCluster:
         mc = self.update_imds_restriction(mc)
         # update VMAS to VMS
         mc = self.update_vmas_to_vms(mc)
+        # update http proxy config
+        mc = self.update_http_proxy_enabled(mc)
 
         return mc
 

src/aks-preview/azext_aks_preview/managednamespace.py

@@ -12,6 +12,8 @@
 from azure.cli.core.util import (
     sdk_no_wait,
 )
+from azure.cli.core.commands.client_factory import get_mgmt_service_client
+from azure.mgmt.containerservice import ContainerServiceClient
 
 from azext_aks_preview._consts import (
     CONST_NAMESPACE_NETWORK_POLICY_RULE_DENYALL,
@@ -27,11 +29,19 @@
 from azext_aks_preview._client_factory import CUSTOM_MGMT_AKS_PREVIEW
 
 
+def get_cluster_location(cmd, resource_group_name, cluster_name):
+    containerservice_client = get_mgmt_service_client(cmd.cli_ctx, ContainerServiceClient)
+    cluster = containerservice_client.managed_clusters.get(resource_group_name, cluster_name)
+    return cluster.location
+
+
 def aks_managed_namespace_add(cmd, client, raw_parameters, headers, no_wait):
     resource_group_name = raw_parameters.get("resource_group_name")
     cluster_name = raw_parameters.get("cluster_name")
     namespace_name = raw_parameters.get("name")
+
     namespace_config = constructNamespace(cmd, raw_parameters, namespace_name)
+    namespace_config.location = get_cluster_location(cmd, resource_group_name, cluster_name)
 
     return sdk_no_wait(
         no_wait,
@@ -193,7 +203,9 @@ def aks_managed_namespace_update(cmd, client, raw_parameters, headers, existedNa
     resource_group_name = raw_parameters.get("resource_group_name")
     cluster_name = raw_parameters.get("cluster_name")
     namespace_name = raw_parameters.get("name")
+
     namespace_config = updateNamespace(cmd, raw_parameters, existedNamespace)
+    namespace_config.location = get_cluster_location(cmd, resource_group_name, cluster_name)
 
     return sdk_no_wait(
         no_wait,

src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_outbound_ips.yaml

@@ -6086,7 +6086,7 @@ def test_aks_create_with_node_config(self, resource_group, resource_group_locati
     # In any case, AKS clirunner will execute this case in live mode every day to ensure that there are no problems,
     # so mark this case as live_only.
     @live_only()
-    @AllowLargeResponse()
+    @AllowLargeResponse(99999)
     @AKSCustomResourceGroupPreparer(
         random_name_length=17, name_prefix="clitest", location="westus2"
     )
@@ -6193,6 +6193,28 @@ def test_aks_create_and_update_with_http_proxy_config(
             ],
         )
 
+        self.kwargs.update(
+            {
+                "resource_group": resource_group,
+                "name": aks_name,
+            }
+        )
+
+        disable_cmd = "aks update --resource-group={resource_group} --name={name} --disable-http-proxy --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/DisableHTTPProxyPreview"
+
+        self.cmd(
+            disable_cmd,
+            checks=[
+                self.check("httpProxyConfig.enabled", False),
+            ],
+        )
+
+        # delete
+        self.cmd(
+            "aks delete -g {resource_group} -n {name} --yes --no-wait",
+            checks=[self.is_empty()],
+        )
+
     @AllowLargeResponse()
     @AKSCustomResourceGroupPreparer(
         random_name_length=17, name_prefix="clitest", location="westus2"
@@ -7269,9 +7291,9 @@ def test_aks_maintenanceconfiguration(
         )
 
     @AllowLargeResponse()
-    @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='eastus2')
+    @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='uksouth')
     def test_aks_managed_namespace(self, resource_group, resource_group_location):
-        # reset the count so in replay mode the random names will start with 0
+        # reset the count so that in replay mode the random names will start with 0
         self.test_resources_count = 0
         # kwargs for string formatting
         resource_name = self.create_random_name('cliakstest', 16)
@@ -7285,10 +7307,11 @@ def test_aks_managed_namespace(self, resource_group, resource_group_location):
             'ssh_key_value': self.generate_ssh_keys(),
         })
 
-        create_cmd = ' '.join([
-            'aks', 'create', '--resource-group={resource_group}', '--name={resource_name}', '--location={location}',
-            '--ssh-key-value={ssh_key_value}'
-        ])
+        create_cmd = (
+            "aks create --resource-group={resource_group} --name={resource_name} --location={location} "
+            "--enable-aad --aad-admin-group-object-ids 00000000-0000-0000-0000-000000000001 "
+            "--ssh-key-value={ssh_key_value}"
+        )
 
         self.cmd(create_cmd, checks=[
             self.check('provisioningState', 'Succeeded'),
@@ -7356,6 +7379,8 @@ def test_aks_managed_namespace(self, resource_group, resource_group_location):
             checks=[self.is_empty()],
         )
 
+        time.sleep(2*60)
+
         self.cmd(
             "aks delete -g {resource_group} -n {resource_name} --yes --no-wait",
             checks=[self.is_empty()],