Fix conflict

.gitignore

@@ -171,3 +171,4 @@ bcs-cc/bin
 bcs-app/backend/settings/ce/dev_*.py
 
 .mypy_cache
+.kube/

bcs-app/backend/activity_log/utils.py

@@ -16,9 +16,9 @@
 
 from django.conf import settings
 
-from backend.apps.cluster.models import CommonStatus
 from backend.components import paas_cc
 from backend.components.bcs.bcs_common_api import BCSClient
+from backend.container_service.clusters.models import CommonStatus
 from backend.utils.errcodes import ErrorCode
 from backend.utils.funutils import convert_mappings
 from backend.utils.response import ComponentData

bcs-app/backend/apis/iam/resources/project.py

@@ -16,7 +16,7 @@
 except Exception:
     pass
 from backend.components import ssm
-from backend.resources.project import filter_projects
+from backend.container_service.projects.base import filter_projects
 
 
 class ProjectProvider(ResourceProvider):

bcs-app/backend/apis/urls.py

@@ -16,10 +16,16 @@
 from .webconsole.views import WebConsoleSession
 
 urlpatterns = [
-    url(r"^projects/", include("backend.apis.projects.urls")),
+    url(r"^projects/", include("backend.container_service.projects.open_apis.urls")),
     # TODO ^resources/projects/ will replace ^projects/(?P<project_id>\w{32})/clusters/ in apigw
-    url(r"^projects/(?P<project_id_or_code>[\w\-]+)/clusters/", include("backend.apis.resources.urls")),
-    url(r"^resources/projects/(?P<project_id_or_code>[\w\-]+)/clusters/", include("backend.apis.resources.urls")),
+    url(
+        r"^projects/(?P<project_id_or_code>[\w\-]+)/clusters/",
+        include("backend.container_service.clusters.open_apis.urls"),
+    ),
+    url(
+        r"^resources/projects/(?P<project_id_or_code>[\w\-]+)/clusters/",
+        include("backend.container_service.clusters.open_apis.urls"),
+    ),
     # TODO ^templatesets/projects/ will replace ^projects/(?P<project_id>\w{32})/configuration/ in apigw
     url(r"^projects/(?P<project_id_or_code>[\w\-]+)/configuration/", include("backend.apis.templatesets.urls")),
     url(r"^templatesets/projects/(?P<project_id_or_code>[\w\-]+)/", include("backend.apis.templatesets.urls")),

bcs-app/backend/apps/application/all_views/k8s_views.py

@@ -30,12 +30,12 @@
 )
 from backend.apps.application.utils import get_instance_version, get_instance_version_name, retry_requests
 from backend.apps.configuration.models import Template
-from backend.apps.hpa.utils import get_deployment_hpa
 from backend.apps.instance.constants import InsState
 from backend.apps.instance.models import InstanceConfig, InstanceEvent, MetricConfig, VersionInstance
 from backend.celery_app.tasks.application import update_create_error_record
 from backend.components import paas_cc
 from backend.components.bcs.k8s import K8SClient
+from backend.kube_core.hpa.utils import get_deployment_hpa
 from backend.utils.basic import getitems
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes

bcs-app/backend/apps/application/all_views/mesos_views.py

@@ -28,10 +28,10 @@
     UNNORMAL_STATUS,
 )
 from backend.apps.configuration.models import Template
-from backend.apps.hpa.utils import get_mesos_deployment_hpa
 from backend.apps.instance.constants import InsState
 from backend.apps.instance.models import InstanceConfig, InstanceEvent, MetricConfig, VersionInstance
 from backend.celery_app.tasks.application import update_create_error_record
+from backend.kube_core.hpa.utils import get_mesos_deployment_hpa
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes
 

bcs-app/backend/apps/configuration/mesos/views.py

@@ -22,8 +22,8 @@
 from backend.apps.configuration import models
 from backend.apps.configuration.constants import MesosResourceName
 from backend.apps.configuration.mixins import GetVersionedEntity
-from backend.apps.network.models import MesosLoadBlance
-from backend.apps.network.utils import get_lb_status
+from backend.uniapps.network.models import MesosLoadBlance
+from backend.uniapps.network.utils import get_lb_status
 from backend.utils.error_codes import error_codes
 from backend.utils.renderers import BKAPIRenderer
 

bcs-app/backend/apps/configuration/namespace/views.py

@@ -36,8 +36,8 @@
 from backend.components import paas_cc
 from backend.components.bcs.k8s import K8SClient
 from backend.components.bcs.mesos import MesosClient
+from backend.container_service.clusters.base.utils import get_clusters
 from backend.resources import namespace as ns_resource
-from backend.resources.cluster.utils import get_clusters
 from backend.resources.namespace.constants import K8S_SYS_PLAT_NAMESPACES
 from backend.resources.namespace.utils import get_namespace_by_id
 from backend.utils.errcodes import ErrorCode

bcs-app/backend/apps/hosts/serializers.py

@@ -13,7 +13,7 @@
 #
 from rest_framework import serializers
 
-from backend.apps.cluster.constants import ClusterNetworkType
+from backend.container_service.clusters.constants import ClusterNetworkType
 
 from .models import HostApplyTaskLog
 

bcs-app/backend/apps/instance/drivers/k8s.py

@@ -20,7 +20,7 @@
 from backend.apps.instance.drivers.base import SchedulerBase
 from backend.components.bcs import mesos
 from backend.components.bcs.k8s import K8SClient
-from backend.resources.cluster.models import CtxCluster
+from backend.container_service.clusters.base.models import CtxCluster
 from backend.resources.hpa import hpa as hpa_client
 from backend.utils.exceptions import ComponentError, ConfigError, Rollback
 

bcs-app/backend/apps/variable/serializers.py

@@ -22,7 +22,7 @@
 from backend.apps.configuration.constants import VARIABLE_PATTERN
 from backend.apps.instance.serializers import InstanceNamespaceSLZ
 from backend.apps.variable.models import Variable
-from backend.resources.cluster.utils import get_clusters
+from backend.container_service.clusters.base.utils import get_clusters
 from backend.resources.namespace.utils import get_namespaces
 
 from .constants import VariableCategory, VariableScope

bcs-app/backend/bcs_k8s/app/bcs_info_injector.py

@@ -16,7 +16,7 @@
 from rest_framework.exceptions import ParseError
 
 from backend.bcs_k8s.diff.parser import split_manifest
-from backend.bcs_k8s.injectors import InjectManager
+from backend.kube_core.toolkit.injectors import InjectManager
 
 from .bcs_info_provider import BcsInfoProvider
 from .utils import yaml_dump, yaml_load

bcs-app/backend/bcs_k8s/app/deployer.py

@@ -22,8 +22,8 @@
 from backend.bcs_k8s import utils as bcs_helm_utils
 from backend.bcs_k8s.app.utils import get_cc_app_id
 from backend.bcs_k8s.helm.bcs_variable import get_valuefile_with_bcs_variable_injected
-from backend.bcs_k8s.kubectl.exceptions import KubectlError, KubectlExecutionError
 from backend.bcs_k8s.kubehelm.exceptions import HelmError, HelmExecutionError
+from backend.kube_core.toolkit.kubectl.exceptions import KubectlError, KubectlExecutionError
 from backend.utils import client as bcs_client
 from backend.utils.basic import ChoicesEnum
 from backend.utils.client import make_kubectl_client, make_kubectl_client_from_kubeconfig

bcs-app/backend/bcs_k8s/app/views.py

@@ -40,14 +40,14 @@
 from backend.bcs_k8s.app.utils import get_helm_dashboard_path
 from backend.bcs_k8s.authtoken.authentication import TokenAuthentication
 from backend.bcs_k8s.bke_client.client import BCSClusterCredentialsNotFound, BCSClusterNotFound
-from backend.bcs_k8s.dashboard.exceptions import DashboardError, DashboardExecutionError
 from backend.bcs_k8s.diff import parser
 from backend.bcs_k8s.helm.models.chart import ChartVersion
 from backend.bcs_k8s.helm.providers.repo_provider import add_plain_repo, add_platform_public_repos, add_repo
 from backend.bcs_k8s.helm.serializers import ChartVersionSLZ
 from backend.bcs_k8s.permissions import check_cluster_perm
 from backend.components import paas_cc
 from backend.components.bcs import k8s
+from backend.kube_core.toolkit.dashboard_cli.exceptions import DashboardError, DashboardExecutionError
 from backend.resources.namespace.constants import K8S_SYS_PLAT_NAMESPACES
 from backend.utils import client as bcs_utils_client
 from backend.utils.errcodes import ErrorCode

bcs-app/backend/bcs_k8s/bke_client/client.py

@@ -20,12 +20,12 @@
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.exceptions import APIException, PermissionDenied
 
-from backend.bcs_k8s import kubectl
 from backend.bcs_k8s.kubehelm.helm import KubeHelmClient
 from backend.bcs_k8s.utils import get_kubectl_version
 from backend.components import bcs
-from backend.resources.cluster.constants import ClusterCOES
-from backend.resources.cluster.utils import get_cluster_coes
+from backend.container_service.clusters.base.constants import ClusterCOES
+from backend.container_service.clusters.base.utils import get_cluster_coes
+from backend.kube_core.toolkit import kubectl
 
 from . import constants
 

bcs-app/backend/bcs_web/permissions.py

@@ -22,8 +22,8 @@
 from backend.components.base import ComponentAuth
 from backend.components.iam import permissions
 from backend.components.paas_cc import PaaSCCClient
-from backend.resources.cluster.models import CtxCluster
-from backend.resources.project.models import CtxProject
+from backend.container_service.clusters.base.models import CtxCluster
+from backend.container_service.projects.base.models import CtxProject
 from backend.utils import FancyDict
 from backend.utils.cache import region
 
@@ -117,7 +117,7 @@ def _refine_project(self, project: FancyDict):
         project.project_code = project.english_name
 
         try:
-            from backend.apps.projects.utils import get_project_kind
+            from backend.container_service.projects.utils import get_project_kind
 
             # k8s类型包含kind为1(bcs k8s)或其它属于k8s的编排引擎
             project.kind = get_project_kind(project.kind)

bcs-app/backend/celery_app/__init__.py

@@ -53,11 +53,11 @@ class CeleryConfig(AppConfig):
 
     def ready(self):
         from backend.accounts.bcs_perm import tasks as bcs_tasks  # noqa
-        from backend.apps.cluster import node_tasks  # noqa
-        from backend.apps.cluster import tasks as cluster_tasks  # noqa
         from backend.apps.configuration import tasks as backend_instance_status  # noqa
         from backend.apps.metric import tasks as metric_tasks  # noqa
         from backend.bcs_k8s.app import tasks as helm_app_tasks  # noqa
         from backend.bcs_k8s.helm import tasks as helm_chart_tasks  # noqa
+        from backend.container_service.clusters import node_tasks  # noqa
+        from backend.container_service.clusters import tasks as cluster_tasks  # noqa
         from backend.packages.blue_krill.async_utils import poll_task  # noqa
         from backend.utils import notify  # noqa

bcs-app/backend/components/paas_cc.py

@@ -19,9 +19,9 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from backend.apps.cluster.models import CommonStatus
 from backend.components.base import BaseHttpClient, BkApiClient, ComponentAuth, response_handler
 from backend.components.utils import http_delete, http_get, http_patch, http_post, http_put
+from backend.container_service.clusters.models import CommonStatus
 from backend.utils.basic import getitems
 from backend.utils.decorators import parse_response_data
 from backend.utils.errcodes import ErrorCode

bcs-app/backend/apps/cluster/apps.py → bcs-app/backend/container_service/clusters/apps.py

@@ -15,4 +15,6 @@
 
 
 class ClusterConfig(AppConfig):
-    name = 'backend.apps.cluster'
+    name = 'backend.container_service.clusters'
+    # 与重构前应用 label "cluster" 保持兼容
+    label = 'cluster'

bcs-app/backend/resources/cluster/models.py → bcs-app/backend/container_service/clusters/base/models.py

@@ -12,7 +12,7 @@
 # specific language governing permissions and limitations under the License.
 #
 """用于在系统内部使用的 Cluster 集群建模"""
-from ..models import BaseContextedModel
+from backend.container_service.core.ctx_models import BaseContextedModel
 
 
 class CtxCluster(BaseContextedModel):

bcs-app/backend/apps/cluster/driver/k8s.py → bcs-app/backend/container_service/clusters/driver/k8s.py

@@ -14,9 +14,9 @@
 import logging
 
 from backend.apps import constants
-from backend.apps.cluster import constants as cluster_constants
-from backend.apps.cluster.constants import K8S_SKIP_NS_LIST
 from backend.components.bcs.k8s import K8SClient
+from backend.container_service.clusters import constants as cluster_constants
+from backend.container_service.clusters.constants import K8S_SKIP_NS_LIST
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes
 

bcs-app/backend/apps/cluster/driver/mesos.py → bcs-app/backend/container_service/clusters/driver/mesos.py

@@ -14,8 +14,8 @@
 import logging
 
 from backend.apps import constants
-from backend.apps.cluster.constants import MESOS_SKIP_NS_LIST
 from backend.components.bcs.mesos import MesosClient
+from backend.container_service.clusters.constants import MESOS_SKIP_NS_LIST
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes
 

bcs-app/backend/apps/cluster/flow_views/cluster.py → bcs-app/backend/container_service/clusters/flow_views/cluster.py

@@ -23,15 +23,15 @@
 
 from backend.accounts.bcs_perm import Cluster, Namespace
 from backend.activity_log import client
-from backend.apps.cluster import constants, serializers
-from backend.apps.cluster.constants import ClusterState
-from backend.apps.cluster.models import ClusterInstallLog, ClusterOperType, CommonStatus
-from backend.apps.cluster.utils import can_use_hosts
 from backend.apps.instance.models import InstanceConfig, InstanceEvent, MetricConfig, VersionInstance
-from backend.apps.network.models import K8SLoadBlance, MesosLoadBlance
 from backend.bcs_k8s.app.models import App
 from backend.components import ops, paas_cc
+from backend.container_service.clusters import constants, serializers
+from backend.container_service.clusters.constants import ClusterState
+from backend.container_service.clusters.models import ClusterInstallLog, ClusterOperType, CommonStatus
+from backend.container_service.clusters.utils import can_use_hosts
 from backend.resources import cluster as cluster_utils
+from backend.uniapps.network.models import K8SLoadBlance, MesosLoadBlance
 from backend.utils.cache import rd_client
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes

bcs-app/backend/apps/cluster/flow_views/configs/k8s.py → bcs-app/backend/container_service/clusters/flow_views/configs/k8s.py

@@ -22,9 +22,9 @@
 
 from django.conf import settings
 
-from backend.apps.cluster import constants
-from backend.apps.cluster.utils import gen_hostname
 from backend.bcs_k8s.bke_client import BCSClusterClient
+from backend.container_service.clusters import constants
+from backend.container_service.clusters.utils import gen_hostname
 from backend.utils.error_codes import error_codes
 
 logger = logging.getLogger(__name__)

bcs-app/backend/apps/cluster/flow_views/configs/mesos.py → bcs-app/backend/container_service/clusters/flow_views/configs/mesos.py

@@ -20,8 +20,8 @@
 
 from django.utils.translation import ugettext_lazy as _
 
-from backend.apps.cluster.models import CommonStatus
 from backend.components import paas_cc
+from backend.container_service.clusters.models import CommonStatus
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes
 

bcs-app/backend/apps/cluster/flow_views/node.py → bcs-app/backend/container_service/clusters/flow_views/node.py

@@ -21,14 +21,14 @@
 
 from backend.accounts.bcs_perm import Cluster
 from backend.activity_log import client
-from backend.apps.cluster import constants, serializers
-from backend.apps.cluster.constants import ClusterState
-from backend.apps.cluster.models import CommonStatus, NodeLabel, NodeOperType, NodeStatus, NodeUpdateLog
-from backend.apps.cluster.utils import can_use_hosts
 from backend.components import ops, paas_cc
 from backend.components.bcs import k8s as bcs_k8s
 from backend.components.bcs import mesos as bcs_mesos
-from backend.resources.cluster import get_cluster
+from backend.container_service.clusters import constants, serializers
+from backend.container_service.clusters.base import get_cluster
+from backend.container_service.clusters.constants import ClusterState
+from backend.container_service.clusters.models import CommonStatus, NodeLabel, NodeOperType, NodeStatus, NodeUpdateLog
+from backend.container_service.clusters.utils import can_use_hosts
 from backend.utils.cache import rd_client
 from backend.utils.errcodes import ErrorCode
 from backend.utils.error_codes import error_codes

bcs-app/backend/apps/cluster/models.py → bcs-app/backend/container_service/clusters/models.py

@@ -142,7 +142,7 @@ def activate_polling(self):
 
     def polling_task(self):
         """轮训任务"""
-        from backend.apps.cluster import tasks
+        from backend.container_service.clusters import tasks
 
         tasks.ClusterOrNodeTaskPoller.start(
             {"model_type": self.__class__.__name__, "pk": self.pk}, tasks.TaskStatusResultHandler

bcs-app/backend/apps/cluster/module_apis.py → bcs-app/backend/container_service/clusters/module_apis.py

@@ -15,31 +15,31 @@
 
 def get_cluster_mod():
     try:
-        from backend.apps.cluster.flow_views_ext import cluster
+        from backend.container_service.clusters.flow_views_ext import cluster
     except ImportError:
-        from backend.apps.cluster.flow_views import cluster
+        from backend.container_service.clusters.flow_views import cluster
     return cluster
 
 
 def get_cluster_node_mod():
     try:
-        from backend.apps.cluster.flow_views_ext import node
+        from backend.container_service.clusters.flow_views_ext import node
     except ImportError:
-        from backend.apps.cluster.flow_views import node
+        from backend.container_service.clusters.flow_views import node
     return node
 
 
 def get_cmdb_mod():
     try:
-        from backend.apps.cluster.flow_views_ext.tools import cmdb
+        from backend.container_service.clusters.flow_views_ext.tools import cmdb
     except ImportError:
-        from backend.apps.cluster.flow_views.tools import cmdb
+        from backend.container_service.clusters.flow_views.tools import cmdb
     return cmdb
 
 
 def get_gse_mod():
     try:
-        from backend.apps.cluster.flow_views_ext.tools import gse
+        from backend.container_service.clusters.flow_views_ext.tools import gse
     except ImportError:
-        from backend.apps.cluster.flow_views.tools import gse
+        from backend.container_service.clusters.flow_views.tools import gse
     return gse

bcs-app/backend/apps/cluster/node_tasks.py → bcs-app/backend/container_service/clusters/node_tasks.py

@@ -17,10 +17,10 @@
 from django.utils.translation import ugettext_lazy as _
 
 from backend.apps import constants
-from backend.apps.cluster import models
-from backend.apps.cluster.constants import K8S_SKIP_NS_LIST
 from backend.components import paas_cc
 from backend.components.bcs import k8s, mesos
+from backend.container_service.clusters import models
+from backend.container_service.clusters.constants import K8S_SKIP_NS_LIST
 from backend.utils.errcodes import ErrorCode
 
 

bcs-app/backend/container_service/clusters/open_apis/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+"""Misc APIs related with cluster
+
+TODO: Refactor current module, move sub-modules into other tightly related directories
+"""

bcs-app/backend/apis/resources/cluster.py → bcs-app/backend/container_service/clusters/open_apis/cluster.py

@@ -14,7 +14,7 @@
 from rest_framework.response import Response
 
 from backend.apis.views import BaseAPIViewSet
-from backend.resources.cluster.utils import get_clusters
+from backend.container_service.clusters.base.utils import get_clusters
 
 
 class ClusterViewSet(BaseAPIViewSet):