Skip to content

Commit 4c8a38b

Browse files
author
Xinkai Yi
committed
fix: 修改网关环境变量配置为动态引入 --story=130029401
1 parent 01c9934 commit 4c8a38b

3 files changed

Lines changed: 18 additions & 13 deletions

File tree

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,6 @@ def logging_addition_settings(logging_dict):
253253
BK_APIGW_STAGE_BACKEND_HOST = f"{app_scheme}://{app_domain}"
254254
BK_APIGW_STAGE_BACKEND_SUBPATH = app_subpath
255255

256-
257-
# while deploy app on staging env, it would sync to the stage=stag of the gateway
258-
# while deploy app on production env, it would sync to the stage=prod of the gateway
259-
BK_APIGW_STAGE_NAME = bkpaas_environment
260-
BK_APIGW_STAGE_DESCRIPTION = "生产环境" if bkpaas_environment == "prod" else "预发布环境"
261-
BK_APIGW_STAGE_DESCRIPTION_EN = "Production Env" if bkpaas_environment == "prod" else "Staging Env"
262-
# 声明网关不同环境的环境变量
263-
stag_env_vars = {"foo": "bar"}
264-
prod_env_vars = {
265-
# "foo": "bar"
266-
}
267-
BK_APIGW_STAGE_ENV_VARS = prod_env_vars if bkpaas_environment == "prod" else stag_env_vars
268-
269256
# 网关同步 API 文档语言, zh/en, 如果配置了BK_APIGW_RESOURCE_DOCS_BASE_DIR(使用自定义文档), 那么必须将这个变量置空
270257
BK_APIGW_RELEASE_DOC_LANGUAGE = os.getenv("BK_APIGW_RELEASE_DOC_LANGUAGE", "")
271258
# 在项目 docs目录下,通过 markdown文档自动化导入中英文文档; 注意markdown文件名必须等于接口的 operation_id; 见 demo 示例

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
else:
1717
from blueapps.patch.settings_paas_services import * # noqa
1818

19+
# 生产环境网关配置
20+
BK_APIGW_STAGE_NAME = "prod"
21+
BK_APIGW_STAGE_DESCRIPTION = "生产环境"
22+
BK_APIGW_STAGE_DESCRIPTION_EN = "Production Env"
23+
24+
# 生产环境网关环境变量
25+
BK_APIGW_STAGE_ENV_VARS = {
26+
# "foo": "bar"
27+
}
28+
1929
# 正式环境
2030
RUN_MODE = "PRODUCT"
2131

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
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"
25+
26+
# 预发布环境网关环境变量
27+
BK_APIGW_STAGE_ENV_VARS = {"foo": "bar"}
28+
2129
# 预发布环境
2230
RUN_MODE = "STAGING"
2331

0 commit comments

Comments
 (0)