add namespace update code

Author: xmzhao0822

src/aks-preview/azext_aks_preview/_help.py

@@ -1670,7 +1670,60 @@
 
 helps['aks namespace add'] = """
     type: command
-    short-summary: Add a namespace to the managed Kubernetes cluster.
+    short-summary: Add namespace to the managed Kubernetes cluster.
+    parameters:
+        - name: --name
+          type: string
+          short-summary: The name of the managed namespace.
+        - name: --cluster-name
+          type: string
+          short-summary: Name of the managed cluster.
+        - name: --tags
+          type: string
+          short-summary: The tags of the managed namespace.
+        - name: --labels
+          type: string
+          short-summary: Labels for the managed namespace.
+        - name: --annotations
+          type: string
+          short-summary: Annotations for the managed namespace.
+        - name: --cpu-request
+          type: string
+          short-summary: CPU request of the namespace.
+        - name: --cpu-limit
+          type: string
+          short-summary: CPU limit of the namespace.
+        - name: --memory-request
+          type: string
+          short-summary: Memory request of the namespace.
+        - name: --memory-limit
+          type: string
+          short-summary: Memory limit of the namespace.
+        - name: --ingress-rule
+          type: string
+          short-summary: Ingress policy rule for the network.
+        - name: --egress-rule
+          type: string
+          short-summary: Egress policy rule for the network.
+        - name: --adoption-policy
+          type: string
+          short-summary: Action if Kubernetes namespace with same name already exists.
+        - name: --delete-policy
+          type: string
+          short-summary: Delete options of a namespace
+        - name: --aks-custom-headers
+          type: string
+          short-summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2
+    examples:
+        - name: Create a namespace in an existing AKS cluster.
+          text: az aks namespace add -g MyResourceGroup --cluster-name MyClusterName --name NamespaceName --cpu-request 500m --cpu-limit 800m --memory-request 1Gi --memory-limit 2Gi --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/ManagedNamespacePreview
+        - name: Create a namespace in an existing AKS cluster with labels, annotations and tags
+          text: az aks namespace add -g MyResourceGroup --cluster-name MyClusterName --name NamespaceName --labels x=y a=b --annotations c=d v=x --tags p=q y=t --cpu-request 500m --cpu-limit 800m --memory-request 1Gi --memory-limit 2Gi --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/ManagedNamespacePreview 
+"""
+
+helps['aks namespace update'] = """
+    type: command
+    short-summary: Update namespace on the managed Kubernetes cluster.
     parameters:
         - name: --name
           type: string

src/aks-preview/azext_aks_preview/_params.py

@@ -1437,7 +1437,7 @@ def load_arguments(self, _):
 
     for scope in [
         "aks namespace add",
-        # "aks namespace update",
+        "aks namespace update",
     ]:
         with self.argument_context(scope) as c:
             c.argument("tags", tags_type, options_list=["--tags"], help="The tags to set to the managed namespace.")

src/aks-preview/azext_aks_preview/commands.py

@@ -244,7 +244,7 @@ def load_command_table(self, _):
         g.custom_command("add", "aks_namespace_add")
         # g.custom_command("list", "aks_namespace_list")
         # g.custom_show_command("show", "aks_namespace_show")
-        # g.custom_command("update", "aks_namespace_update")
+        g.custom_command("update", "aks_namespace_update")
         # g.custom_command("delete", "aks_namespace_delete")
         # g.custom_command("get-credentials", "aks_get_credentials")
 

src/aks-preview/azext_aks_preview/custom.py

@@ -95,6 +95,7 @@
 )
 from azext_aks_preview.managednamespace import (
     aks_managed_namespace_add,
+    aks_managed_namespace_update,
 )
 from azure.cli.command_modules.acs._helpers import (
     get_user_assigned_identity_by_resource_id
@@ -247,10 +248,10 @@ def aks_namespace_add(
     labels=None,
     annotations=None,
     aks_custom_headers=None,
-    ingress_rule=CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWSAMENAMESPACE,
-    egress_rule=CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWALL,
-    adoption_policy=CONST_NAMESPACE_ADOPTION_POLICY_NEVER,
-    delete_policy=CONST_NAMESPACE_DELETE_POLICY_KEEP,
+    ingress_rule=None,
+    egress_rule=None,
+    adoption_policy=None,
+    delete_policy=None,
 ):
     existedNamespace = None
     try:
@@ -259,17 +260,49 @@ def aks_namespace_add(
         pass
 
     if existedNamespace:
-        raise Exception(  # pylint: disable=broad-exception-raised
-            "Namespace " +
-            name +
-            " already existed, please use 'az aks namespace update' command to update!"
+        raise CLIError(
+            f"Namespace '{name}' already exists. Please use 'az aks namespace update' to update it."
         )
 
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()
     headers = get_aks_custom_headers(aks_custom_headers)
     return aks_managed_namespace_add(cmd, client, raw_parameters, headers)
 
+# pylint: disable=unused-argument
+def aks_namespace_update(
+    cmd,
+    client,
+    resource_group_name,
+    cluster_name,
+    name,
+    cpu_request=None,
+    cpu_limit=None,
+    memory_request=None,
+    memory_limit=None,
+    tags=None,
+    labels=None,
+    annotations=None,
+    aks_custom_headers=None,
+    ingress_rule=None,
+    egress_rule=None,
+    adoption_policy=None,
+    delete_policy=None,
+):
+    try:
+        existedNamespace = client.get(resource_group_name, cluster_name, name)
+    except ResourceNotFoundError:
+        raise CLIError(
+            f"Namespace '{name}' doesn't exist."
+            "Please use 'aks namespace list' to get current list of managed namespaces"
+        )
+    
+    if existedNamespace:
+        #DO NOT MOVE: get all the original parameters and save them as a dictionary
+        raw_parameters = locals()
+        headers = get_aks_custom_headers(aks_custom_headers)
+        return aks_managed_namespace_update(cmd, client, raw_parameters, headers, existedNamespace)
+
 
 def aks_maintenanceconfiguration_list(
     cmd,  # pylint: disable=unused-argument

src/aks-preview/azext_aks_preview/managednamespace.py

@@ -26,7 +26,7 @@ def aks_managed_namespace_add(cmd, client, raw_parameters, headers):
     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_config = constructNamespace(cmd, raw_parameters, namespace_name)
 
     return client.begin_create_or_update(
         resource_group_name=resource_group_name,
@@ -36,8 +36,7 @@ def aks_managed_namespace_add(cmd, client, raw_parameters, headers):
         headers=headers
     )
 
-def constructNamespace(cmd, raw_parameters):
-    namespace_name = raw_parameters.get("name")
+def constructNamespace(cmd, raw_parameters, namespace_name):
     tags = raw_parameters.get("tags", {})
     labels_raw = raw_parameters.get("labels")
     labels = parse_key_value_list(labels_raw)
@@ -66,7 +65,6 @@ def constructNamespace(cmd, raw_parameters):
     )
 
     namespace_config = Namespace()
-    print(namespace_config)
     namespace_config.name = namespace_name
     namespace_config.tags = tags
     namespace_config.properties = namespace_properties
@@ -99,8 +97,8 @@ def setResourceQuota(cmd, raw_parameters):
     return rq
 
 def setNetworkPolicyRule(cmd, raw_parameters):
-    ingress_rule = raw_parameters.get("ingress_rule", CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWSAMENAMESPACE)
-    egress_rule = raw_parameters.get("egress_rule", CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWALL)
+    ingress_rule = raw_parameters.get("ingress_rule") or CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWSAMENAMESPACE
+    egress_rule = raw_parameters.get("egress_rule") or  CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWALL
 
     valid_network_policy_rules = {
         CONST_NAMESPACE_NETWORK_POLICY_RULE_DENYALL,
@@ -134,7 +132,7 @@ def setNetworkPolicyRule(cmd, raw_parameters):
     return np
 
 def setAdoptionPolicy(cmd, raw_parameters):
-    adoption_policy = raw_parameters.get("adoption_policy", CONST_NAMESPACE_ADOPTION_POLICY_NEVER)
+    adoption_policy = raw_parameters.get("adoption_policy") or CONST_NAMESPACE_ADOPTION_POLICY_NEVER
 
     valid_adoption_policy = {
         CONST_NAMESPACE_ADOPTION_POLICY_NEVER,
@@ -151,7 +149,7 @@ def setAdoptionPolicy(cmd, raw_parameters):
     return adoption_policy
 
 def setDeletePolicy(cmd, raw_parameters):
-    delete_policy = raw_parameters.get("delete_policy", CONST_NAMESPACE_DELETE_POLICY_KEEP)
+    delete_policy = raw_parameters.get("delete_policy") or CONST_NAMESPACE_DELETE_POLICY_KEEP
 
     valid_delete_policy = {
         CONST_NAMESPACE_DELETE_POLICY_KEEP,
@@ -176,3 +174,164 @@ def parse_key_value_list(pairs):
         key, value = pair.split("=", 1)
         result[key.strip()] = value.strip()
     return result
+
+def aks_managed_namespace_update(cmd, client, raw_parameters, headers, existedNamespace):
+    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)
+
+    return client.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        resource_name=cluster_name,
+        namespace_name=namespace_name,
+        parameters=namespace_config,
+        headers=headers
+    )
+
+def updateNamespace(cmd, raw_parameters, existedNamespace):
+    tags = raw_parameters.get("tags", {})
+    labels_raw = raw_parameters.get("labels")
+    labels = parse_key_value_list(labels_raw)
+    annotations_raw = raw_parameters.get("annotations")
+    annotations = parse_key_value_list(annotations_raw)
+
+    NamespaceProperties = cmd.get_models(
+        "NamespaceProperties",
+        resource_type = CUSTOM_MGMT_AKS_PREVIEW,
+        operation_group = "namespaces"
+    )
+    
+    namespace_properties = NamespaceProperties(
+        labels = labels,
+        annotations = annotations,
+        default_resource_quota = updateResourceQuota(cmd, raw_parameters, existedNamespace),
+        default_network_policy = updateNetworkPolicyRule(cmd, raw_parameters, existedNamespace),
+        adoption_policy = updateAdoptionPolicy(cmd, raw_parameters, existedNamespace),
+        delete_policy = updateDeletePolicy(cmd, raw_parameters, existedNamespace)
+    )
+
+    Namespace = cmd.get_models(
+        "Namespace",
+        resource_type = CUSTOM_MGMT_AKS_PREVIEW,
+        operation_group = "namespaces"
+    )
+    
+    namespace_config = Namespace()
+    namespace_config.name = existedNamespace.name
+    namespace_config.tags = tags
+    namespace_config.properties = namespace_properties
+    return namespace_config
+
+def updateResourceQuota(cmd, raw_parameters, existedNamespace):
+    cpu_request = raw_parameters.get("cpu_request")
+    cpu_limit = raw_parameters.get("cpu_limit")
+    memory_request = raw_parameters.get("memory_request")
+    memory_limit = raw_parameters.get("memory_limit")
+
+    if cpu_request is None:
+        cpu_request = existedNamespace.properties.default_resource_quota.cpu_request
+    
+    if cpu_limit is None:
+        cpu_limit = existedNamespace.properties.default_resource_quota.cpu_limit
+
+    if memory_request is None:
+        memory_request = existedNamespace.properties.default_resource_quota.memory_request
+    
+    if memory_limit is None:
+        memory_limit = existedNamespace.properties.default_resource_quota.memory_limit
+    
+    ResourceQuota = cmd.get_models(
+        "ResourceQuota",
+        resource_type = CUSTOM_MGMT_AKS_PREVIEW,
+        operation_group = "namespaces"
+    )
+
+    rq = ResourceQuota(
+        cpu_request = cpu_request,
+        cpu_limit = cpu_limit,
+        memory_request = memory_request,
+        memory_limit = memory_limit
+    )
+    
+    return rq
+
+def updateNetworkPolicyRule(cmd, raw_parameters, existedNamespace):
+    ingress_rule = raw_parameters.get("ingress_rule")
+    egress_rule = raw_parameters.get("egress_rule")
+
+    valid_network_policy_rules = {
+        CONST_NAMESPACE_NETWORK_POLICY_RULE_DENYALL,
+        CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWSAMENAMESPACE,
+        CONST_NAMESPACE_NETWORK_POLICY_RULE_ALLOWALL
+    }
+
+    if ingress_rule not in valid_network_policy_rules:
+        raise InvalidArgumentValueError(
+            f"Invalid ingress_rule '{ingress_rule}'. Must be one of: "
+            f"{', '.join(valid_network_policy_rules)}"
+        )
+    
+    if egress_rule not in valid_network_policy_rules:
+        raise InvalidArgumentValueError(
+            f"Invalid egress_rule '{egress_rule}'. Must be one of: "
+            f"{', '.join(valid_network_policy_rules)}"
+        )
+    
+    if ingress_rule is None:
+        ingress_rule = existedNamespace.properties.default_network_policy.ingress
+    
+    if egress_rule is None:
+        egress_rule = existedNamespace.properties.default_network_policy.egress
+
+    NetworkPolicies = cmd.get_models(
+        "NetworkPolicies",
+        resource_type=CUSTOM_MGMT_AKS_PREVIEW,
+        operation_group="namespaces"
+    )
+
+    np = NetworkPolicies(
+        ingress = ingress_rule,
+        egress = egress_rule
+    )
+    
+    return np
+
+def updateAdoptionPolicy(cmd, raw_parameters, existedNamespace):
+    adoption_policy = raw_parameters.get("adoption_policy")
+    
+    valid_adoption_policy = {
+        CONST_NAMESPACE_ADOPTION_POLICY_NEVER,
+        CONST_NAMESPACE_ADOPTION_POLICY_IFIDENTICAL,
+        CONST_NAMESPACE_ADOPTION_POLICY_ALWAYS
+    }
+
+    if adoption_policy not in valid_adoption_policy:
+        raise InvalidArgumentValueError(
+            f"Invalid adoption policy '{adoption_policy}'. Must be one of: "
+            f"{', '.join(valid_adoption_policy)}"
+        )
+    
+    if adoption_policy is None:
+        adoption_policy = existedNamespace.properties.adoption_policy
+    
+    return adoption_policy
+
+def updateDeletePolicy(cmd, raw_parameters, existedNamespace):
+    delete_policy = raw_parameters.get("delete_policy")
+    
+    valid_delete_policy = {
+        CONST_NAMESPACE_DELETE_POLICY_KEEP,
+        CONST_NAMESPACE_DELETE_POLICY_DELETE
+    }
+
+    if delete_policy not in valid_delete_policy:
+        raise InvalidArgumentValueError(
+            f"Invalid delete policy '{delete_policy}'. Must be one of: "
+            f"{', '.join(valid_delete_policy)}"
+        )
+    
+    if delete_policy is None:
+        delete_policy = existedNamespace.properties.delete_policy
+    
+    return delete_policy