From 26b347018707d7b9e916a51caa3a7bf8d8495fe4 Mon Sep 17 00:00:00 2001
From: jiayuan929 <252461528@qq.com>
Date: Thu, 30 May 2024 20:48:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E4=BB=93?=
=?UTF-8?q?=E5=BA=93=E7=9A=84=E5=8F=AF=E8=A7=81=E8=8C=83=E5=9B=B4=E5=8F=AF?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../paasng/bk_plugins/pluginscenter/sourcectl/tencent.py | 4 +---
apiserver/paasng/paasng/settings/__init__.py | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apiserver/paasng/paasng/bk_plugins/pluginscenter/sourcectl/tencent.py b/apiserver/paasng/paasng/bk_plugins/pluginscenter/sourcectl/tencent.py
index b71c283cd6..2091a14f33 100644
--- a/apiserver/paasng/paasng/bk_plugins/pluginscenter/sourcectl/tencent.py
+++ b/apiserver/paasng/paasng/bk_plugins/pluginscenter/sourcectl/tencent.py
@@ -260,9 +260,7 @@ def create_project(self, plugin: PluginInstance):
"name": plugin.id,
"namespace_id": self._get_namespace_id(),
"description": plugin.name,
- # 私有项目 visibility_level = 0
- # 公共项目 visibility_level = 10
- "visibility_level": 10,
+ "visibility_level": settings.PLUGIN_VISIBILTY_LEVEL,
},
)
validate_response(resp)
diff --git a/apiserver/paasng/paasng/settings/__init__.py b/apiserver/paasng/paasng/settings/__init__.py
index bc89f03fcc..1f7b6d1e95 100644
--- a/apiserver/paasng/paasng/settings/__init__.py
+++ b/apiserver/paasng/paasng/settings/__init__.py
@@ -944,6 +944,8 @@ def _build_file_handler(log_path: Path, filename: str, format: str) -> Dict:
BK_PLUGIN_APIGW_SERVICE_STAGE = settings.get("BK_PLUGIN_APIGW_SERVICE_STAGE", "prod") # 环境（stage）
BK_PLUGIN_APIGW_SERVICE_USER_AUTH_TYPE = settings.get("BK_PLUGIN_APIGW_SERVICE_USER_AUTH_TYPE", "default") # 用户类型
+# 插件仓库的可见范围:私有项目 visibility_level = 0; 公共项目 visibility_level = 10
+PLUGIN_VISIBILTY_LEVEL = 10
# -------------
# 引擎相关配置项
From 27a33317bb8346fb9c882cafc9e8adf7b8735d71 Mon Sep 17 00:00:00 2001
From: jiayuan929 <252461528@qq.com>
Date: Thu, 30 May 2024 20:52:53 +0800
Subject: [PATCH 2/2] fix: minor
---
apiserver/paasng/paasng/settings/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apiserver/paasng/paasng/settings/__init__.py b/apiserver/paasng/paasng/settings/__init__.py
index 1f7b6d1e95..6e883f7304 100644
--- a/apiserver/paasng/paasng/settings/__init__.py
+++ b/apiserver/paasng/paasng/settings/__init__.py
@@ -945,7 +945,7 @@ def _build_file_handler(log_path: Path, filename: str, format: str) -> Dict:
BK_PLUGIN_APIGW_SERVICE_USER_AUTH_TYPE = settings.get("BK_PLUGIN_APIGW_SERVICE_USER_AUTH_TYPE", "default") # 用户类型
# 插件仓库的可见范围:私有项目 visibility_level = 0; 公共项目 visibility_level = 10
-PLUGIN_VISIBILTY_LEVEL = 10
+PLUGIN_VISIBILTY_LEVEL = settings.get("PLUGIN_VISIBILTY_LEVEL", 10)
# -------------
# 引擎相关配置项