Skip to content

Commit

Permalink
feature: 移除 blueking ieod 依赖 (closed TencentBlueKing#2054)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhuoZhuoCrayon committed Jan 15, 2024
1 parent 5a52e97 commit 4eb9bc1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion apps/component/esbclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# 这里配置sdk包名和setting.RUN_VER的对应关系,需要维护
plat_package_map = {
# 内部版
"ieod": "ieod",
"ieod": "",
# 腾讯云
"qcloud": "qcloud",
# 混合云
Expand Down
2 changes: 2 additions & 0 deletions config/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@
}


ESB_SDK_NAME = "blueking.component"

BKCRYPTO = {
"SYMMETRIC_CIPHERS": {
"default": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/pack_ieod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ sed -i '/static\/nodeman/d' .gitignore
# 调整requirements
# sed -ie 's/blueapps-open/blueapps/g' requirements.txt
echo -e '
blueking-component-ieod==0.1.12
bkoauth==0.0.22
' >> requirements.txt

# TODO 容器化版本没有统一前,ieod 版本部署时删除该文件
rm -rf app_desc.yaml

# 删除blueking,因为内置的blueking, bkoauth只有open版
rm -rf blueking
# New: 节点管理对 blueking 的使用仅限于 cc 的接口,尝试对逻辑进行合并复用
# rm -rf blueking
rm -rf bkoauth
2 changes: 0 additions & 2 deletions support-files/kubernetes/images/family_bucket/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ COPY --from=static-builder /static/ /app/static/
FROM base-app AS ieod-app

RUN set -ex && \
rm -rf blueking && \
rm -rf bkoauth && \
pip install --no-cache-dir python-crontab==2.6.0 && \
pip install --no-cache-dir blueking-component-ieod==0.1.12 && \
pip install --no-cache-dir bkoauth==0.0.22

# 移除 upstreams 检查
Expand Down

0 comments on commit 4eb9bc1

Please sign in to comment.