From 16973bd4871badca3acd7fa963af8922eeba3fa2 Mon Sep 17 00:00:00 2001
From: wklken <wklken@gmail.com>
Date: Tue, 27 Jun 2023 10:33:12 +0800
Subject: [PATCH] feat(paas/envs): add BK_DOMAIN for all apps (#1093)

---
 paas2/VERSION                           | 2 +-
 paas2/paas/app/manager.py               | 1 +
 paas2/paas/conf/default.py              | 2 ++
 paas2/paas/conf/settings_development.py | 1 +
 paas2/paas/conf/settings_testing.py     | 1 +
 paas2/release.md                        | 2 ++
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/paas2/VERSION b/paas2/VERSION
index eb93c092a..3c8703bb4 100644
--- a/paas2/VERSION
+++ b/paas2/VERSION
@@ -1 +1 @@
-2.14.51
+2.14.52
diff --git a/paas2/paas/app/manager.py b/paas2/paas/app/manager.py
index 0c597fc6f..26eaaa0b3 100644
--- a/paas2/paas/app/manager.py
+++ b/paas2/paas/app/manager.py
@@ -61,6 +61,7 @@ def get_app_env(self, app_code, is_with_db_info=False):
             "BK_CC_HOST": bk_cc_host,
             "BK_JOB_HOST": bk_job_host,
             "BK_API_URL_TMPL": settings.BK_API_URL_TMPL,
+            "BK_DOMAIN": settings.BK_DOMAIN,
         }
         # update envs in settings_*.py
         envs.update(settings.APP_DEPLOY_ENVS)
diff --git a/paas2/paas/conf/default.py b/paas2/paas/conf/default.py
index 9fa63dc78..4a2072540 100644
--- a/paas2/paas/conf/default.py
+++ b/paas2/paas/conf/default.py
@@ -321,6 +321,8 @@
 BK_APIGW_DOC_URL = ""
 # 新版网关访问地址模板, e.g. http://bkapi.example.com/api/{api_name}
 BK_API_URL_TMPL = ""
+# 蓝鲸使用的domain
+BK_DOMAIN = ""
 
 # HTTP CONNECTIONS
 REQUESTS_POOL_CONNECTIONS = 20
diff --git a/paas2/paas/conf/settings_development.py b/paas2/paas/conf/settings_development.py
index 309292070..470167932 100644
--- a/paas2/paas/conf/settings_development.py
+++ b/paas2/paas/conf/settings_development.py
@@ -54,6 +54,7 @@
 BK_COOKIE_AGE = 60 * 60 * 24
 # cookie访问域
 BK_COOKIE_DOMAIN = ".bking.com"
+BK_DOMAIN = "bking.com"
 
 # 控制台地址
 ENGINE_HOST = "http://127.0.0.1:8000"
diff --git a/paas2/paas/conf/settings_testing.py b/paas2/paas/conf/settings_testing.py
index c60fe8574..a77444134 100644
--- a/paas2/paas/conf/settings_testing.py
+++ b/paas2/paas/conf/settings_testing.py
@@ -24,6 +24,7 @@
 
 # cookie访问域
 BK_COOKIE_DOMAIN = ".bking.com"
+BK_DOMAIN = "bking.com"
 
 # domain
 PAAS_DOMAIN = "openpaas.o.bking.com"
diff --git a/paas2/release.md b/paas2/release.md
index 48082c467..09c02830c 100644
--- a/paas2/release.md
+++ b/paas2/release.md
@@ -1,5 +1,7 @@
 Release Log
 ===============================
+# 2.14.52
+    - add: env var `BK_DOMAIN` for all app
 
 # 2.14.51
     - fix: lock greenlet version to 1.1.2