Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix:update blue-krill version #634

Merged
merged 5 commits into from
Aug 17, 2023
Merged

Fix:update blue-krill version #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08ded58
Fix:update blue-krill version
SheepSheepChen Aug 17, 2023
d0a1f9c
feat: add built-in environment variable BK_CRYPTO_TYPE
SheepSheepChen Aug 17, 2023
55a8146
feat: add built-in environment variable BK_CRYPTO_TYPE
SheepSheepChen Aug 17, 2023
11c8433
feat: add built-in environment variable BK_CRYPTO_TYPE
SheepSheepChen Aug 17, 2023
7a2a75d
feat: add built-in environment variable BK_CRYPTO_TYPE
SheepSheepChen Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apiserver/paasng/conf.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## 用于加密数据库内容的 Secret
# BKKRILL_ENCRYPT_SECRET_KEY: ''

## 选择加密数据库内容的算法，可选择：'FernetCipher' , 'SM4CTR'
# ENCRYPT_CIPHER_TYPE : ''
## 选择加密数据库内容的算法，可选择：'SHANGMI' , 'CLASSIC'，分别对应 'SM4CTR'和'Fernet' 算法
# BK_CRYPTO_TYPE : ''

## （Django）特定 Django 安装的密钥。用于提供 加密签名，默认值为：${BKKRILL_ENCRYPT_SECRET_KEY}
## 更多参考：https://docs.djangoproject.com/zh-hans/3.2/ref/settings/#secret-key
Expand Down
1 change: 1 addition & 0 deletions apiserver/paasng/paasng/engine/configurations/config_var.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def generate_env_vars_for_bk_platform(config_vars_prefix: str) -> Dict[str, str]
"""Generate the platform address in the bk system"""

system_envs = {
'BK_CRYPTO_TYPE': settings.BK_CRYPTO_TYPE,
'BK_DOMAIN': settings.BK_DOMAIN,
'URL': settings.BKPAAS_URL,
# 蓝鲸桌面地址
Expand Down
5 changes: 3 additions & 2 deletions apiserver/paasng/paasng/settings/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@
# Django 项目使用的 SECRET_KEY，如未配置，使用 BKKRILL 的 secret key 替代
SECRET_KEY = settings.get("SECRET_KEY") or force_str(BKKRILL_ENCRYPT_SECRET_KEY)

# 选择加密数据库内容的算法，可选择：'FernetCipher' , 'SM4CTR'
ENCRYPT_CIPHER_TYPE = settings.get('ENCRYPT_CIPHER_TYPE', 'FernetCipher')
# 选择加密数据库内容的算法，可选择：'SHANGMI' , 'CLASSIC'
BK_CRYPTO_TYPE = settings.get('BK_CRYPTO_TYPE', 'CLASSIC')
ENCRYPT_CIPHER_TYPE = 'SM4CTR' if BK_CRYPTO_TYPE == 'SHANGMI' else 'FernetCipher'

DEBUG = settings.get('DEBUG', False)

Expand Down
8 changes: 4 additions & 4 deletions apiserver/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apiserver/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bkpaas-auth = "==2.0.6"
apigw-manager = {version = ">=1.0.14"}
bkstorages = {version = "==1.0.8"}
bleach = "==2.0.0"
blue-krill = {version = "==2.0.1"}
blue-krill = {version = "==2.0.2"}
bkapi-component-open = {version = ">=1.0.0"}
boto = "==2.43.0"
boto3 = "<1.15.0"
Expand Down