Skip to content

Commit 618f2bc

Browse files
author
Xinkai Yi
committed
fix: 添加部分插件配置变量 --story=130029401
1 parent 610e64b commit 618f2bc

2 files changed

Lines changed: 23 additions & 8 deletions

File tree

runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def logging_addition_settings(logging_dict):
250250
# 网关管理员,请将负责人加入列表中
251251
BK_APIGW_MAINTAINERS = [m.strip() for m in os.getenv("BK_APIGW_MAINTAINERS", "admin").split(",") if m.strip()]
252252
# 网关接口最大超时时间
253-
BK_APIGW_STAG_BACKEND_TIMEOUT = 60
253+
BK_APIGW_STAG_BACKEND_TIMEOUT = int(os.getenv("BK_APIGW_DEFAULT_TIMEOUT", "60"))
254254

255255

256256
# analysis the app environment and address via bkpaas env vars
@@ -269,8 +269,24 @@ def logging_addition_settings(logging_dict):
269269
# 网关同步 API 文档语言, zh/en, 如果配置了BK_APIGW_RESOURCE_DOCS_BASE_DIR(使用自定义文档), 那么必须将这个变量置空
270270
BK_APIGW_RELEASE_DOC_LANGUAGE = os.getenv("BK_APIGW_RELEASE_DOC_LANGUAGE", "")
271271
# 在项目 docs目录下,通过 markdown文档自动化导入中英文文档; 注意markdown文件名必须等于接口的 operation_id; 见 demo 示例
272-
# BK_APIGW_RESOURCE_DOCS_BASE_DIR = env.str("BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=BASE_DIR / "docs")
273-
272+
BK_APIGW_RESOURCE_DOCS_BASE_DIR = os.getenv("BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs"))
273+
274+
# NOTE: 根据 BKPAAS_ENVIRONMENT 自动设置 stage name
275+
# stag 环境对应 stag,其他环境(prod、dev)对应 prod
276+
BK_APIGW_STAGE_NAME = os.getenv("BK_APIGW_STAGE_NAME", "stag" if BKPAAS_ENVIRONMENT == "stag" else "prod")
277+
278+
BK_APIGW_RELEASE_VERSION = (
279+
# NOTE: 每次部署必须强制版本号变更,否则代码变更版本号不变,不会打出新版本
280+
# log: resource_version 1.0.3+stag already exists, skip creating
281+
os.getenv("BK_APIGW_RELEASE_VERSION", default="1.0.0")
282+
+ "+"
283+
+ BK_APIGW_STAGE_NAME
284+
)
285+
BK_APIGW_RELEASE_TITLE = os.getenv("BK_APIGW_RELEASE_TITLE", default=f"gateway release(stage={BK_APIGW_STAGE_NAME})")
286+
BK_APIGW_RELEASE_COMMENT = os.getenv(
287+
"BK_APIGW_RELEASE_COMMENT",
288+
default=f"auto release by bk-apigw-plugin-runtime(stage={BK_APIGW_STAGE_NAME})",
289+
)
274290
# BK SOPS RELATE
275291
BK_SOPS_APP_CODE = os.getenv("BK_SOPS_APP_CODE")
276292

@@ -303,7 +319,6 @@ def logging_addition_settings(logging_dict):
303319
BK_APIGW_CORS_ALLOW_ORIGINS = os.getenv("BK_APIGW_CORS_ALLOW_ORIGINS", "")
304320
BK_APIGW_CORS_ALLOW_METHODS = os.getenv("BK_APIGW_CORS_ALLOW_METHODS", "")
305321
BK_APIGW_CORS_ALLOW_HEADERS = os.getenv("BK_APIGW_CORS_ALLOW_HEADERS", "")
306-
BK_APIGW_DEFAULT_TIMEOUT = int(os.getenv("BK_APIGW_DEFAULT_TIMEOUT", "60"))
307322
BK_APIGW_GRANT_PERMISSION_DIMENSION_GATEWAY_APP_CODES = [BK_APP_CODE] + [
308323
each.strip() for each in os.getenv("BK_APIGW_GRANTED_APPS", "").split(",") if each.strip()
309324
]

runtime/bk-plugin-runtime/bk_plugin_runtime/config/stag.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
else:
1919
from blueapps.patch.settings_paas_services import * # noqa
2020

21-
# 开发环境网关配置
22-
BK_APIGW_STAGE_NAME = "dev"
23-
BK_APIGW_STAGE_DESCRIPTION = "开发环境"
24-
BK_APIGW_STAGE_DESCRIPTION_EN = "Development Env"
21+
# 预发布环境网关配置
22+
BK_APIGW_STAGE_NAME = "stag"
23+
BK_APIGW_STAGE_DESCRIPTION = "预发布环境"
24+
BK_APIGW_STAGE_DESCRIPTION_EN = "Staging Env"
2525

2626
# 预发布环境网关环境变量
2727
BK_APIGW_STAGE_ENV_VARS = {"foo": "bar"}

0 commit comments

Comments
 (0)