fix: windows安装agent出现ieod脚本同时curl和执行 (closed TencentBlueKing#2409)

ping15 · Aug 22, 2024 · 1b47813 · 1b47813
1 parent f7446b4
commit 1b47813
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/apps/core/script_manage/data.py b/apps/core/script_manage/data.py
@@ -13,6 +13,7 @@
 
 from django.utils.translation import ugettext_lazy as _
 
+import env
 from apps.node_man import constants as node_man_constants
 
 from ...node_man.constants import DEFAULT_CLOUD
@@ -37,9 +38,10 @@
 
 IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO: base.ScriptInfo = base.ScriptInfo(
     name="ieod_active_firewall_policy",
-    filename="ieod_active_firewall_policy.bat",
-    path="script_manage_tmp/ieod_active_firewall_policy.bat",
+    filename="",
+    path="",
     description=_("IDC Windows 物理机安装策略开通"),
+    oneline=env.BKAPP_IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO,
     support_os_list=[node_man_constants.OsType.WINDOWS],
     support_cloud_id=DEFAULT_CLOUD,
 )

diff --git a/env/__init__.py b/env/__init__.py
@@ -65,6 +65,8 @@
     "BKPAAS_SHARED_RES_URL",
     "BKAPP_LEGACY_AUTH",
     "BK_NOTICE_ENABLED",
+    # WINDOWS IEOD脚本内容
+    "BKAPP_IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO",
 ]
 
 # ===============================================================================
@@ -86,6 +88,9 @@
     key="BKAPP_SYNC_PROC_STATUS_TASK_INTERVAL", default=20 * 60, _type=int
 )
 BKAPP_SCRIPT_HOOKS = get_type_env(key="BKAPP_SCRIPT_HOOKS", default="", _type=str)
+BKAPP_IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO = get_type_env(
+    key="BKAPP_IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO", default="", _type=str
+)
 
 # ===============================================================================
 # 日志

diff --git a/support-files/kubernetes/helm/bk-nodeman/README.md b/support-files/kubernetes/helm/bk-nodeman/README.md
@@ -349,6 +349,7 @@ externalRabbitMQ:
 | `config.bkAppNavHelperUrl`               | 导航栏技术支持地址                                                                                                                                                                                               | `https://wpa1.qq.com/KziXGWJs?_type=wpa&qidian=true` |
 | `config.bkAppSyncProcStatusTaskInterval` | 插件进程状态同步周期                                                                                                                                                                                               | `20 * 60`                                           |
 | `config.bkAppScriptHooks`                | Agent安装前置脚本                                                                                                                                                                                               | `""`                                           |
+| `config.bkAppIEODActiveFirewallPolicyScriptInfo`                | WINDOWS IEOD脚本内容                                                                                                                                                                                               | `""`                                           |
 
 ## 额外的环境变量
 

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml
@@ -131,3 +131,4 @@ data:
   BKPAAS_SHARED_RES_URL: "{{ .Values.bkSharedResUrl }}"
   BKAPP_LEGACY_AUTH: "{{ .Values.config.bkAppLegacyAuth }}"
   BK_NOTICE_ENABLED: "{{ .Values.bkNotice.enabled }}"
+  BKAPP_IEOD_ACTIVE_FIREWALL_POLICY_SCRIPT_INFO: "{{ .Values.config.bkAppIEODActiveFirewallPolicyScriptInfo }}"
diff --git a/support-files/kubernetes/helm/bk-nodeman/values.yaml b/support-files/kubernetes/helm/bk-nodeman/values.yaml
@@ -467,6 +467,8 @@ config:
   bkAppSyncProcStatusTaskInterval: 1200
   ## Agent安装前置脚本
   bkAppScriptHooks: ""
+  ## WINDOWS IEOD脚本内容
+  bkAppIEODActiveFirewallPolicyScriptInfo: ""
 
 
 ## --------------------------------------