feat: 将IS_PURE_GSE2_VERSION改为由环境变量控制(closed #2582)

Author: chalice-1831

apps/core/gray/tools.py

@@ -10,6 +10,7 @@
 """
 import typing
 
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 from apps.core.concurrent.cache import FuncCacheDecorator
@@ -55,9 +56,7 @@ def get_host_ap_gse_version(self, bk_biz_id: typing.Any, ap_id: int, is_install_
         if is_install_other_agent:
             # 注入AP ID 优先使用注入AP 的GSE 版本
             gse_version: str = self.ap_id_obj_map[ap_id].gse_version
-        elif node_man_models.GlobalSettings.get_config(
-            node_man_models.GlobalSettings.KeyEnum.IS_PURE_GSE2_VERSION.value, False
-        ):
+        elif settings.BKAPP_IS_PURE_GSE2_VERSION:
             # 纯 GSE2.0 版本
             gse_version: str = GseVersion.V2.value
         elif self.is_gse2_gray(bk_biz_id):

apps/node_man/models.py

@@ -186,8 +186,6 @@ class KeyEnum(Enum):
         UPDATE_SUBSCRIPTION_RECORDS_LENGTH = "UPDATE_SUBSCRIPTION_RECORDS_LENGTH"
         # 禁用的订阅
         DISABLED_SUBSCRIPTIONS = "DISABLED_SUBSCRIPTIONS"
-        # 是否默认当前环境为仅GSE2环境
-        IS_PURE_GSE2_VERSION = "IS_PURE_GSE2_VERSION"
         # 管理GSE2 Agent监听BT端口开关
         GSE2_AGENT_LISTEN_BT_SOCKET = "GSE2_AGENT_LISTEN_BT_SOCKET"
         # 禁用的订阅

config/default.py

@@ -41,6 +41,7 @@
 BK_BACKEND_CONFIG = env.BK_BACKEND_CONFIG
 BKPAAS_MAJOR_VERSION = env.BKPAAS_MAJOR_VERSION
 BKPAAS_BK_CRYPTO_TYPE = env.BKPAAS_BK_CRYPTO_TYPE
+BKAPP_IS_PURE_GSE2_VERSION = env.BKAPP_IS_PURE_GSE2_VERSION
 
 
 # ===============================================================================

env/__init__.py

@@ -71,13 +71,16 @@
     "BKAPP_DEFAULT_INSTALL_CHANNEL_ID",
     "BKAPP_AUTOMATIC_CHOICE_CLOUD_ID",
     "TXY_ENDPOINT",
+    # 当前环境为仅GSE2环境
+    "BKAPP_IS_PURE_GSE2_VERSION",
 ]
 
 # ===============================================================================
 # 运行时，用于区分环境差异
 # ===============================================================================
 # 运行环境，ce / ee / ieod，设置为 ce 将会改变 gse 端口的默认配置
 BKAPP_RUN_ENV = get_type_env(key="BKAPP_RUN_ENV", default="ee", _type=str)
+BKAPP_IS_PURE_GSE2_VERSION = get_type_env(key="BKAPP_IS_PURE_GSE2_VERSION", default=False, _type=bool)
 # 后台是否为 PaaS 部署
 BKAPP_IS_PAAS_DEPLOY = BKAPP_IS_PAAS_DEPLOY
 # 是否开启动态主机配置协议适配

support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml

@@ -140,4 +140,4 @@ data:
   BKAPP_UNASSIGNED_CLOUD_ID: "{{ .Values.config.bkAppUnassignedCloudId}}"
   BKAPP_CACHE_BIZ_IDS: "{{.Values.config.CacheBizIds}}"
   BKAPP_BK_CC_APIGATEWAY_V3: "{{.Values.config.bkAppBkCcApiGatewayV3}}"
-  
+  BKAPP_IS_PURE_GSE2_VERSION: "{{ .Values.config.bkAppIsPureGse2Version }}"

support-files/kubernetes/helm/bk-nodeman/values.yaml

@@ -475,6 +475,8 @@ config:
   bkAppAutomaticChoiceCloudId: -1
   ## 未分配管控区域ID
   bkAppUnassignedCloudId: 90000001
+  ## 当前环境为仅GSE2环境
+  bkAppIsPureGse2Version: true
 
 
 ## --------------------------------------