feat(helm chart): 更新Helm Chart到0.11.6-beta版本，调整配置存储方式到文件。
This commit is contained in:
zhangxinhui02
6
helm-chart/files/.env
Normal file
6
helm-chart/files/.env
Normal file
@@ -0,0 +1,6 @@
|
||||
HOST=0.0.0.0
|
||||
PORT=8000
|
||||
WEBUI_ENABLED={{ if .Values.core.webui.enabled }}true{{ else }}false{{ end }}
|
||||
WEBUI_MODE=production
|
||||
WEBUI_HOST=0.0.0.0
|
||||
WEBUI_PORT=8001
|
||||
@@ -1,12 +1,8 @@
|
||||
#!/bin/sh
|
||||
# 此脚本用于覆盖core容器的默认启动命令，进行一些初始化
|
||||
# 1
|
||||
# 由于k8s与docker-compose的卷挂载方式有所不同，需要利用此脚本为一些文件和目录提前创建好软链接
|
||||
# /MaiMBot/data是麦麦数据的实际挂载路径
|
||||
# /MaiMBot/statistics是统计数据的实际挂载路径
|
||||
# 2
|
||||
# 此脚本等待辅助容器webui-cm-sync就绪后再启动麦麦
|
||||
# 通过检测/MaiMBot/webui-cm-sync/ready文件来判断
|
||||
|
||||
set -e
|
||||
echo "[K8s Init] Preparing volume..."
|
||||
@@ -34,22 +30,6 @@ fi
|
||||
|
||||
echo "[K8s Init] Volume ready."
|
||||
|
||||
# 如果启用了WebUI，则等待辅助容器webui-cm-sync就绪，然后创建中间层配置文件软链接
|
||||
if [ "$MAIBOT_WEBUI_ENABLED" = "true" ]
|
||||
then
|
||||
echo "[K8s Init] WebUI enabled. Waiting for container 'webui-cm-sync' ready..."
|
||||
while [ ! -f /MaiMBot/webui-cm-sync/ready ]; do
|
||||
sleep 1
|
||||
done
|
||||
echo "[K8s Init] Container 'webui-cm-sync' ready."
|
||||
mkdir -p /MaiMBot/config
|
||||
ln -s /MaiMBot/webui-cm-sync/model_config.toml /MaiMBot/config/model_config.toml
|
||||
ln -s /MaiMBot/webui-cm-sync/bot_config.toml /MaiMBot/config/bot_config.toml
|
||||
echo "[K8s Init] Config files middle layer for WebUI created."
|
||||
else
|
||||
echo "[K8s Init] WebUI is disabled."
|
||||
fi
|
||||
|
||||
# 启动麦麦
|
||||
echo "[K8s Init] Waking up MaiBot..."
|
||||
echo
|
||||
|
||||
@@ -1,95 +0,0 @@
|
||||
#!/usr/local/bin/python3
|
||||
# 用户插件目录存储在存储卷中，会在启动时覆盖掉容器的默认插件目录。此脚本用于默认插件更新后或麦麦首次启动时为用户自动安装默认插件到存储卷中
|
||||
# 如果用户主动删除插件且插件无更新，则不会再次安装。插件状态保存在/MaiMBot/data/plugins/.installed-setup-plugins文件中
|
||||
# 此脚本应当挂载进初始化容器中，从/MaiMBot工作路径开始运行。初始化容器的镜像同core容器，初始化容器中应挂载core存储卷的数据到/MaiMBot/data
|
||||
import os
|
||||
import shutil
|
||||
import hashlib
|
||||
from datetime import datetime
|
||||
|
||||
SRC_DIR = '/MaiMBot/plugins'
|
||||
DST_DIR = '/MaiMBot/data/plugins'
|
||||
STATUS_FILE = f'{DST_DIR}/.installed-setup-plugins'
|
||||
BAK_DIR = '/MaiMBot/data/plugins-backup'
|
||||
CURRENT_TIME = datetime.now().strftime('%Y%m%d%H%M%S')
|
||||
|
||||
def hash_dir_file(path: str):
|
||||
"""计算目录/文件的SHA256，用于判断是否发生变化"""
|
||||
def hash_file(_file_path: str):
|
||||
_h = hashlib.sha256()
|
||||
with open(_file_path, 'rb') as _f:
|
||||
for _chunk in iter(lambda: _f.read(8192), b''):
|
||||
_h.update(_chunk)
|
||||
return _h.hexdigest()
|
||||
|
||||
if os.path.isfile(path):
|
||||
return hash_file(path)
|
||||
|
||||
h = hashlib.sha256()
|
||||
for root, dirs, files in os.walk(path):
|
||||
for filename in sorted(files):
|
||||
filepath = os.path.join(root, filename)
|
||||
relpath = os.path.relpath(filepath, path)
|
||||
file_hash = hash_file(filepath)
|
||||
h.update(relpath.encode('utf-8'))
|
||||
h.update(file_hash.encode('utf-8'))
|
||||
return h.hexdigest()
|
||||
|
||||
def copy_plugin(plugin: str):
|
||||
"""复制插件，如果插件已存在则备份旧的插件然后用新的插件覆盖"""
|
||||
src = os.path.join(SRC_DIR, plugin)
|
||||
if not os.path.exists(src):
|
||||
raise FileNotFoundError(f"File not found: {src}")
|
||||
|
||||
dst = os.path.join(DST_DIR, plugin)
|
||||
if os.path.exists(dst):
|
||||
print(f"\t\tWarning: Old version of plugin '{plugin}' already exists. "
|
||||
f"Old plugin will be moved to '{BAK_DIR}/{CURRENT_TIME}/{plugin}'. "
|
||||
f"Remember to re-edit config of this plugin.")
|
||||
if not os.path.exists(os.path.join(BAK_DIR, CURRENT_TIME)):
|
||||
os.makedirs(os.path.join(BAK_DIR, CURRENT_TIME))
|
||||
if os.path.isdir(dst):
|
||||
shutil.copytree(dst, os.path.join(BAK_DIR, CURRENT_TIME, plugin))
|
||||
shutil.rmtree(dst)
|
||||
else:
|
||||
shutil.copy2(dst, os.path.join(BAK_DIR, CURRENT_TIME))
|
||||
os.remove(dst)
|
||||
|
||||
if os.path.isdir(src):
|
||||
shutil.copytree(src, dst)
|
||||
else:
|
||||
shutil.copy2(src, DST_DIR)
|
||||
|
||||
setup_plugins = {plugin: hash_dir_file(plugin) for plugin in os.listdir(SRC_DIR)}
|
||||
installed_plugins = {}
|
||||
to_install_plugins = {}
|
||||
|
||||
print(f"[SetupPlugins] Default plugin, which has been updated or never been installed, "
|
||||
f"will be installed in this init container.")
|
||||
if os.path.exists(STATUS_FILE) and os.path.isfile(STATUS_FILE):
|
||||
print(f"[SetupPlugins] Reading status file: '{STATUS_FILE}'...")
|
||||
with open(STATUS_FILE, 'r', encoding='utf-8') as f:
|
||||
lines = f.readlines()
|
||||
for line in lines:
|
||||
if line == '':
|
||||
continue
|
||||
plugin = line.strip().split(':')
|
||||
installed_plugins[plugin[0]] = plugin[1]
|
||||
print(f"[SetupPlugins] Found {len(installed_plugins)} default plugins which used to be installed:")
|
||||
for plugin in installed_plugins.keys():
|
||||
print(f'\t{plugin}')
|
||||
else:
|
||||
print(f"[SetupPlugins] No status file found. Status file '{STATUS_FILE}' will be created. "
|
||||
f"All default plugins will be installed now.")
|
||||
|
||||
print(f"[SetupPlugins] Checking plugins...")
|
||||
for plugin, sha256 in setup_plugins.items():
|
||||
if (plugin not in installed_plugins) or (sha256 != installed_plugins[plugin]):
|
||||
print(f"\tFound default plugin to install: '{plugin}'. Installing...")
|
||||
copy_plugin(plugin)
|
||||
installed_plugins[plugin] = sha256
|
||||
|
||||
with open(STATUS_FILE, 'w', encoding='utf-8') as f:
|
||||
f.write('\n'.join(sorted([f'{plugin}:{sha256}' for plugin, sha256 in installed_plugins.items()])))
|
||||
|
||||
print(f"[SetupPlugins] Default plugin checking done. Status saved to '{STATUS_FILE}'.")
|
||||
Reference in New Issue
Block a user