{AKS} Remove deprecated code

src/aks-preview/azext_aks_preview/_params.py

@@ -21,12 +21,12 @@
 )
 from knack.arguments import CLIArgumentType
 
-from ._completers import (
+from azext_aks_preview._completers import (
     get_k8s_upgrades_completion_list,
     get_k8s_versions_completion_list,
     get_vm_size_completion_list,
 )
-from ._consts import (
+from azext_aks_preview._consts import (
     CONST_CREDENTIAL_FORMAT_AZURE,
     CONST_CREDENTIAL_FORMAT_EXEC,
     CONST_GPU_INSTANCE_PROFILE_MIG1_G,
@@ -69,7 +69,7 @@
     CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PUBLIC,
     CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PRIVATE,
 )
-from ._validators import (
+from azext_aks_preview._validators import (
     validate_acr,
     validate_addon,
     validate_addons,

src/aks-preview/azext_aks_preview/_podidentity.py

@@ -8,10 +8,12 @@
 from knack.log import get_logger
 from knack.util import CLIError
 
-from ._client_factory import get_auth_management_client
-from ._consts import (CONST_MANAGED_IDENTITY_OPERATOR_ROLE,
-                      CONST_MANAGED_IDENTITY_OPERATOR_ROLE_ID)
-from ._roleassignments import add_role_assignment
+from azext_aks_preview._client_factory import get_auth_management_client
+from azext_aks_preview._consts import (
+    CONST_MANAGED_IDENTITY_OPERATOR_ROLE,
+    CONST_MANAGED_IDENTITY_OPERATOR_ROLE_ID,
+)
+from azext_aks_preview._roleassignments import add_role_assignment
 
 logger = get_logger(__name__)
 

src/aks-preview/azext_aks_preview/_resourcegroup.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 
 from knack.util import CLIError
-from ._client_factory import cf_resource_groups
+from azext_aks_preview._client_factory import cf_resource_groups
 
 
 def get_rg_location(ctx, resource_group_name, subscription_id=None):

src/aks-preview/azext_aks_preview/_roleassignments.py

@@ -9,7 +9,7 @@
 from knack.log import get_logger
 from knack.util import CLIError
 from msrestazure.azure_exceptions import CloudError
-from ._client_factory import get_auth_management_client, get_graph_rbac_management_client
+from azext_aks_preview._client_factory import get_auth_management_client, get_graph_rbac_management_client
 
 logger = get_logger(__name__)
 

src/aks-preview/azext_aks_preview/_validators.py

@@ -4,26 +4,25 @@
 # --------------------------------------------------------------------------------------------
 
 from __future__ import unicode_literals
+
 import os
 import os.path
 import re
-from math import isnan, isclose
 from ipaddress import ip_network
+from math import isclose, isnan
 
-from knack.log import get_logger
-
-from azure.cli.core.azclierror import InvalidArgumentValueError, ArgumentUsageError, RequiredArgumentMissingError
+import azure.cli.core.keys as keys
+from azure.cli.core.azclierror import (
+    ArgumentUsageError,
+    InvalidArgumentValueError,
+    RequiredArgumentMissingError,
+)
 from azure.cli.core.commands.validators import validate_tag
 from azure.cli.core.util import CLIError
-import azure.cli.core.keys as keys
-
-from ._helpers import (_fuzzy_match)
+from knack.log import get_logger
 
-from ._consts import (
-    ADDONS,
-    CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PUBLIC,
-    CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PRIVATE,
-)
+from azext_aks_preview._consts import ADDONS
+from azext_aks_preview._helpers import _fuzzy_match
 
 logger = get_logger(__name__)
 

src/aks-preview/azext_aks_preview/addonconfiguration.py

@@ -11,16 +11,30 @@
 from azure.cli.core.commands.client_factory import get_subscription_id
 from azure.cli.core.util import sdk_no_wait
 from azext_aks_preview._client_factory import CUSTOM_MGMT_AKS_PREVIEW
-from ._client_factory import cf_resources, cf_resource_groups
-from ._resourcegroup import get_rg_location
-from ._roleassignments import add_role_assignment
-from ._consts import ADDONS, CONST_VIRTUAL_NODE_ADDON_NAME, CONST_MONITORING_ADDON_NAME, \
-    CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID, CONST_MONITORING_USING_AAD_MSI_AUTH, \
-    CONST_VIRTUAL_NODE_SUBNET_NAME, CONST_INGRESS_APPGW_ADDON_NAME, CONST_INGRESS_APPGW_APPLICATION_GATEWAY_NAME, \
-    CONST_INGRESS_APPGW_SUBNET_CIDR, CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID, CONST_INGRESS_APPGW_SUBNET_ID, \
-    CONST_INGRESS_APPGW_WATCH_NAMESPACE, CONST_OPEN_SERVICE_MESH_ADDON_NAME, CONST_CONFCOM_ADDON_NAME, \
-    CONST_ACC_SGX_QUOTE_HELPER_ENABLED, CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME, CONST_SECRET_ROTATION_ENABLED, CONST_ROTATION_POLL_INTERVAL, \
-    CONST_KUBE_DASHBOARD_ADDON_NAME
+from azext_aks_preview._client_factory import cf_resources, cf_resource_groups
+from azext_aks_preview._resourcegroup import get_rg_location
+from azext_aks_preview._roleassignments import add_role_assignment
+from azext_aks_preview._consts import (
+    ADDONS,
+    CONST_VIRTUAL_NODE_ADDON_NAME,
+    CONST_MONITORING_ADDON_NAME,
+    CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID,
+    CONST_MONITORING_USING_AAD_MSI_AUTH,
+    CONST_VIRTUAL_NODE_SUBNET_NAME,
+    CONST_INGRESS_APPGW_ADDON_NAME,
+    CONST_INGRESS_APPGW_APPLICATION_GATEWAY_NAME,
+    CONST_INGRESS_APPGW_SUBNET_CIDR,
+    CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID,
+    CONST_INGRESS_APPGW_SUBNET_ID,
+    CONST_INGRESS_APPGW_WATCH_NAMESPACE,
+    CONST_OPEN_SERVICE_MESH_ADDON_NAME,
+    CONST_CONFCOM_ADDON_NAME,
+    CONST_ACC_SGX_QUOTE_HELPER_ENABLED,
+    CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
+    CONST_SECRET_ROTATION_ENABLED,
+    CONST_ROTATION_POLL_INTERVAL,
+    CONST_KUBE_DASHBOARD_ADDON_NAME,
+)
 from .vendored_sdks.azure_mgmt_preview_aks.v2022_05_02_preview.models import (
     ManagedClusterIngressProfile,
     ManagedClusterIngressProfileWebAppRouting,

src/aks-preview/azext_aks_preview/commands.py

@@ -16,7 +16,6 @@
 from ._format import aks_addon_list_available_table_format, aks_addon_list_table_format, aks_addon_show_table_format
 from ._format import aks_agentpool_show_table_format
 from ._format import aks_agentpool_list_table_format
-from ._format import aks_versions_table_format
 from ._format import aks_upgrades_table_format
 from ._format import aks_pod_identities_table_format
 from ._format import aks_pod_identity_exceptions_table_format

src/aks-preview/azext_aks_preview/custom.py

@@ -127,9 +127,7 @@
 )
 
 from .vendored_sdks.azure_mgmt_preview_aks.v2022_05_02_preview.models import (
-    AgentPool,
     AgentPoolUpgradeSettings,
-    ContainerServiceStorageProfileTypes,
     CreationData,
     KubeletConfig,
     LinuxOSConfig,
@@ -2388,10 +2386,9 @@ def aks_pod_identity_add(cmd, client, resource_group_name, cluster_name,
         pod_identity.binding_selector = binding_selector
     pod_identities.append(pod_identity)
 
-    from azext_aks_preview.decorator import AKSPreviewModels
-
+    from azext_aks_preview.managed_cluster_decorator import AKSPreviewManagedClusterModels
     # store all the models used by pod identity
-    pod_identity_models = AKSPreviewModels(
+    pod_identity_models = AKSPreviewManagedClusterModels(
         cmd, CUSTOM_MGMT_AKS_PREVIEW).pod_identity_models
     _update_addon_pod_identity(
         instance, enable=True,
@@ -2418,10 +2415,9 @@ def aks_pod_identity_delete(cmd, client, resource_group_name, cluster_name,
                 continue
             pod_identities.append(pod_identity)
 
-    from azext_aks_preview.decorator import AKSPreviewModels
-
+    from azext_aks_preview.managed_cluster_decorator import AKSPreviewManagedClusterModels
     # store all the models used by pod identity
-    pod_identity_models = AKSPreviewModels(
+    pod_identity_models = AKSPreviewManagedClusterModels(
         cmd, CUSTOM_MGMT_AKS_PREVIEW).pod_identity_models
     _update_addon_pod_identity(
         instance, enable=True,
@@ -2451,10 +2447,9 @@ def aks_pod_identity_exception_add(cmd, client, resource_group_name, cluster_nam
         name=exc_name, namespace=exc_namespace, pod_labels=pod_labels)
     pod_identity_exceptions.append(exc)
 
-    from azext_aks_preview.decorator import AKSPreviewModels
-
+    from azext_aks_preview.managed_cluster_decorator import AKSPreviewManagedClusterModels
     # store all the models used by pod identity
-    pod_identity_models = AKSPreviewModels(
+    pod_identity_models = AKSPreviewManagedClusterModels(
         cmd, CUSTOM_MGMT_AKS_PREVIEW).pod_identity_models
     _update_addon_pod_identity(
         instance, enable=True,
@@ -2480,10 +2475,9 @@ def aks_pod_identity_exception_delete(cmd, client, resource_group_name, cluster_
                 continue
             pod_identity_exceptions.append(exc)
 
-    from azext_aks_preview.decorator import AKSPreviewModels
-
+    from azext_aks_preview.managed_cluster_decorator import AKSPreviewManagedClusterModels
     # store all the models used by pod identity
-    pod_identity_models = AKSPreviewModels(
+    pod_identity_models = AKSPreviewManagedClusterModels(
         cmd, CUSTOM_MGMT_AKS_PREVIEW).pod_identity_models
     _update_addon_pod_identity(
         instance, enable=True,
@@ -2517,10 +2511,9 @@ def aks_pod_identity_exception_update(cmd, client, resource_group_name, cluster_
         raise CLIError(
             'pod identity exception {}/{} not found'.format(exc_namespace, exc_name))
 
-    from azext_aks_preview.decorator import AKSPreviewModels
-
+    from azext_aks_preview.managed_cluster_decorator import AKSPreviewManagedClusterModels
     # store all the models used by pod identity
-    pod_identity_models = AKSPreviewModels(
+    pod_identity_models = AKSPreviewManagedClusterModels(
         cmd, CUSTOM_MGMT_AKS_PREVIEW).pod_identity_models
     _update_addon_pod_identity(
         instance, enable=True,