From ef49cc7e1f95756e8e4621d16d421a81e487ae93 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Mon, 27 Oct 2025 22:24:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?Fix:=20=E5=A4=87=E4=BB=BDvalues=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8Cauthhub=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_eulercopilot.sh | 108 ++++++++++++++++-- .../9-other-script/update_auth_config.sh | 3 - 2 files changed, 101 insertions(+), 10 deletions(-) diff --git a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh index 06f6c7335..778d3fbd2 100755 --- a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh +++ b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh @@ -39,6 +39,8 @@ show_help() { echo -e "选项:" echo -e " --help 显示此帮助信息" echo -e " --eulercopilot_address 指定EulerCopilot前端访问URL" + echo -e " --authhub_address 指定AuthHub认证服务地址" + echo -e " --authelia_address 指定Authelia认证服务地址" echo -e " --enable-tls 启用TLS证书支持" echo -e " --tls-cert 指定TLS证书文件路径" echo -e " --tls-key 指定TLS私钥文件路径" @@ -46,6 +48,7 @@ show_help() { echo -e "" echo -e "示例:" echo -e " $0 --eulercopilot_address http://myhost:30080" + echo -e " $0 --eulercopilot_address http://myhost:30080 --authhub_address http://139.9.242.191:30081" echo -e " $0 --eulercopilot_address https://myhost:30443 --enable-tls --generate-cert myhost" echo -e " $0 --eulercopilot_address https://myhost:30443 --enable-tls --tls-cert /path/to/cert.crt --tls-key /path/to/key.key${NC}" echo -e "" @@ -69,6 +72,26 @@ parse_arguments() { exit 1 fi ;; + --authhub_address) + if [ -n "$2" ]; then + auth_service_address="$2" + auth_service_type="authhub" + shift + else + echo -e "${RED}错误: --authhub_address 需要提供一个值${NC}" >&2 + exit 1 + fi + ;; + --authelia_address) + if [ -n "$2" ]; then + auth_service_address="$2" + auth_service_type="authelia" + shift + else + echo -e "${RED}错误: --authelia_address 需要提供一个值${NC}" >&2 + exit 1 + fi + ;; --enable-tls) use_tls="true" ;; @@ -474,9 +497,24 @@ create_authelia_client() { # 设置服务信息 auth_service_type="authelia" - local host_ip - host_ip=$(hostname -I | awk '{print $1}') - auth_service_address="https://${host_ip}:30091" + # 优先使用用户输入的地址或从values.yaml获取已配置的地址 + if [ -z "$auth_service_address" ]; then + # 尝试从values.yaml获取已配置的authelia地址 + local configured_address + configured_address=$(grep -E "^\s*authelia:\s*https?://" "${DEPLOY_DIR}/chart/euler_copilot/values.yaml" 2>/dev/null | sed -E 's/^\s*authelia:\s*//' | tr -d '"' | head -1) + if [ -n "$configured_address" ]; then + auth_service_address="$configured_address" + echo -e "${GREEN}使用已配置的authelia地址: $auth_service_address${NC}" + else + # 使用统一的IP获取方法 + local host_ip + host_ip=$(get_network_ip) + auth_service_address="https://${host_ip}:30091" + echo -e "${YELLOW}自动检测到authelia地址: $auth_service_address${NC}" + fi + else + echo -e "${GREEN}使用指定的authelia地址: $auth_service_address${NC}" + fi return 0 else @@ -500,6 +538,25 @@ get_client_info_auto() { echo -e "${BLUE}正在自动获取认证信息...${NC}" + # 如果用户通过命令行指定了认证服务，直接使用 + if [ -n "$auth_service_type" ] && [ -n "$auth_service_address" ]; then + echo -e "${GREEN}使用命令行指定的认证服务：${auth_service_type} (${auth_service_address})${NC}" + + # 根据服务类型设置相应的配置 + if [ "$auth_service_type" = "authelia" ]; then + # 使用authelia客户端管理工具创建客户端 + if create_authelia_client; then + return 0 + else + echo -e "${YELLOW}authelia客户端创建失败，尝试使用备用方法...${NC}" + fi + else + # 对于authhub，需要设置默认的client_id和client_secret + # 这些将通过Python脚本获取或使用默认值 + echo -e "${YELLOW}将使用通用脚本获取${auth_service_type}认证信息...${NC}" + fi + fi + # 检测鉴权服务类型 echo -e "${BLUE}检测已部署的鉴权服务...${NC}" @@ -508,10 +565,24 @@ get_client_info_auto() { echo -e "${GREEN}检测到authelia服务，使用authelia_automation.sh创建客户端${NC}" auth_service_type="authelia" - # 获取authelia服务地址 - local host_ip - host_ip=$(hostname -I | awk '{print $1}') - auth_service_address="https://${host_ip}:30091" + # 获取authelia服务地址 - 优先使用用户输入或已配置的地址 + if [ -z "$auth_service_address" ]; then + # 尝试从values.yaml获取已配置的authelia地址 + local configured_address + configured_address=$(grep -E "^\s*authelia:\s*https?://" "${DEPLOY_DIR}/chart/euler_copilot/values.yaml" 2>/dev/null | sed -E 's/^\s*authelia:\s*//' | tr -d '"' | head -1) + if [ -n "$configured_address" ]; then + auth_service_address="$configured_address" + echo -e "${GREEN}使用已配置的authelia地址: $auth_service_address${NC}" + else + # 使用统一的IP获取方法 + local host_ip + host_ip=$(get_network_ip) + auth_service_address="https://${host_ip}:30091" + echo -e "${YELLOW}自动检测到authelia地址: $auth_service_address${NC}" + fi + else + echo -e "${GREEN}使用指定的authelia地址: $auth_service_address${NC}" + fi # 使用authelia_automation.sh创建客户端 if create_authelia_client; then @@ -561,6 +632,29 @@ get_client_info_auto() { auth_service_type=$(echo "$output" | grep -oP '鉴权服务类型:\s*\K\S+' | tail -1) auth_service_address=$(echo "$output" | grep -oP '鉴权服务地址:\s*\K\S+' | tail -1) + # 优化服务地址：优先使用用户输入或已配置的地址 + if [ "$auth_service_type" = "authhub" ] || [ "$auth_service_type" = "authHub" ]; then + # 尝试从values.yaml获取已配置的authhub地址 + local configured_address + configured_address=$(grep -E "^\s*authhub:\s*https?://" "${DEPLOY_DIR}/chart/euler_copilot/values.yaml" 2>/dev/null | sed -E 's/^\s*authhub:\s*//' | tr -d '"' | head -1) + if [ -n "$configured_address" ]; then + auth_service_address="$configured_address" + echo -e "${GREEN}使用已配置的authhub地址: $auth_service_address${NC}" + else + echo -e "${YELLOW}使用脚本检测到的authhub地址: $auth_service_address${NC}" + fi + elif [ "$auth_service_type" = "authelia" ]; then + # 尝试从values.yaml获取已配置的authelia地址 + local configured_address + configured_address=$(grep -E "^\s*authelia:\s*https?://" "${DEPLOY_DIR}/chart/euler_copilot/values.yaml" 2>/dev/null | sed -E 's/^\s*authelia:\s*//' | tr -d '"' | head -1) + if [ -n "$configured_address" ]; then + auth_service_address="$configured_address" + echo -e "${GREEN}使用已配置的authelia地址: $auth_service_address${NC}" + else + echo -e "${YELLOW}使用脚本检测到的authelia地址: $auth_service_address${NC}" + fi + fi + # 清理临时文件 rm -f "$temp_file" diff --git a/deploy/scripts/9-other-script/update_auth_config.sh b/deploy/scripts/9-other-script/update_auth_config.sh index 91439aad0..17f8737c2 100755 --- a/deploy/scripts/9-other-script/update_auth_config.sh +++ b/deploy/scripts/9-other-script/update_auth_config.sh @@ -118,9 +118,6 @@ update_domain_config() { echo -e "${BLUE}==> 更新域名配置...${NC}" - # 备份原文件 - cp "$VALUES_FILE" "$VALUES_FILE.backup.$(date +%Y%m%d_%H%M%S)" - # 使用更精确的sed更新配置（只匹配domain部分） case "$auth_service" in "authhub") -- Gitee From 237dfe2f63c785ddba2b39027f30086aa6ce464c Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 06:46:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Fix:=20framework=20storage=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=81=BF=E5=85=8D=E5=85=B1=E7=94=A8PV=E9=80=A0?= =?UTF-8?q?=E6=88=90=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/framework-storage.yaml | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/deploy/chart/euler_copilot/templates/framework/framework-storage.yaml b/deploy/chart/euler_copilot/templates/framework/framework-storage.yaml index 25047e1b8..103e36b4b 100644 --- a/deploy/chart/euler_copilot/templates/framework/framework-storage.yaml +++ b/deploy/chart/euler_copilot/templates/framework/framework-storage.yaml @@ -1,5 +1,6 @@ {{- if .Values.euler_copilot.framework.enabled -}} --- +# 语义数据存储PV - 专门用于framework语义接口数据 apiVersion: v1 kind: PersistentVolume metadata: @@ -8,13 +9,30 @@ metadata: spec: storageClassName: {{ default "local-path" .Values.globals.storageClass }} capacity: - storage: {{ default "10Gi" .Values.storage.frameworkSemantics.size }} + storage: {{ default "5Gi" .Values.storage.frameworkSemantics.size }} accessModes: - ReadWriteOnce hostPath: - path: {{ default "/var/lib/eulercopilot" .Values.storage.frameworkSemantics.path }} + path: {{ default "/var/lib/eulercopilot/semantics" .Values.storage.frameworkSemantics.path }} --- +# Web静态文件存储PV - 专门用于前后端共享静态文件 +apiVersion: v1 +kind: PersistentVolume +metadata: + name: web-static-pv + namespace: {{ .Release.Namespace }} +spec: + storageClassName: {{ default "local-path" .Values.globals.storageClass }} + capacity: + storage: {{ default "10Gi" .Values.storage.webAsset.size }} + accessModes: + - ReadWriteOnce + hostPath: + path: {{ default "/var/lib/eulercopilot/static" .Values.storage.webAsset.path }} + +--- +# 语义数据PVC apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -27,5 +45,21 @@ spec: resources: requests: storage: {{ default "5Gi" .Values.storage.frameworkSemantics.size }} - volumeName: framework-semantics + volumeName: framework-semantics + +--- +# Web静态文件PVC +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: web-static + namespace: {{ .Release.Namespace }} +spec: + storageClassName: {{ default "local-path" .Values.globals.storageClass }} + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ default "10Gi" .Values.storage.webAsset.size }} + volumeName: web-static-pv {{- end -}} -- Gitee From c97e2449f3db2f7957171d4841e3cb6af28ef69b Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 06:46:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Fix:=20auth=E9=83=A8=E7=BD=B2=E8=A1=A5?= =?UTF-8?q?=E5=85=85pod=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_auth_service.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/deploy/scripts/7-install-auth-service/install_auth_service.sh b/deploy/scripts/7-install-auth-service/install_auth_service.sh index dbc7db473..7d1f7825c 100755 --- a/deploy/scripts/7-install-auth-service/install_auth_service.sh +++ b/deploy/scripts/7-install-auth-service/install_auth_service.sh @@ -556,7 +556,6 @@ check_auth_pods_status() { local timeout=300 local start_time=$(date +%s) - local auth_service_lower=$(echo "$AUTH_SERVICE" | tr '[:upper:]' '[:lower:]') echo -e "${BLUE}开始监控${AUTH_SERVICE}服务Pod状态（总超时时间300秒）...${NC}" >&2 @@ -565,25 +564,25 @@ check_auth_pods_status() { local elapsed=$((current_time - start_time)) if [ $elapsed -gt $timeout ]; then - echo -e "${YELLOW}警告：认证服务部署超时！请检查以下资源：${NC}" >&2 - kubectl get pods -n euler-copilot -l "app.kubernetes.io/name=${auth_service_lower}" -o wide + echo -e "${YELLOW}警告：部署超时！请检查以下资源：${NC}" >&2 + kubectl get pods -n euler-copilot -o wide echo -e "\n${YELLOW}建议检查：${NC}" - echo "1. 查看认证服务Pod的日志: kubectl logs -n euler-copilot -l app.kubernetes.io/name=${auth_service_lower}" + echo "1. 查看未就绪Pod的日志: kubectl logs -n euler-copilot " echo "2. 检查PVC状态: kubectl get pvc -n euler-copilot" - echo "3. 检查Service状态: kubectl get svc -n euler-copilot -l app.kubernetes.io/name=${auth_service_lower}" + echo "3. 检查Service状态: kubectl get svc -n euler-copilot" return 1 fi - # 只检查认证服务相关的Pod - local not_running=$(kubectl get pods -n euler-copilot -l "app.kubernetes.io/name=${auth_service_lower}" -o jsonpath='{range .items[*]}{.metadata.name} {.status.phase} {.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' \ + # 统一检查euler-copilot命名空间下所有Pod的状态 + local not_running=$(kubectl get pods -n euler-copilot -o jsonpath='{range .items[*]}{.metadata.name} {.status.phase} {.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' \ | awk '$2 != "Running" || $3 != "True" {print $1 " " $2}') if [ -z "$not_running" ]; then - echo -e "${GREEN}认证服务Pod已正常运行！${NC}" >&2 - kubectl get pods -n euler-copilot -l "app.kubernetes.io/name=${auth_service_lower}" -o wide + echo -e "${GREEN}所有Pod已正常运行！${NC}" >&2 + kubectl get pods -n euler-copilot -o wide return 0 else - echo "等待认证服务Pod就绪（已等待 ${elapsed} 秒）..." + echo "等待Pod就绪（已等待 ${elapsed} 秒）..." echo "当前未就绪Pod：" echo "$not_running" | awk '{print " - " $1 " (" $2 ")"}' sleep 10 -- Gitee From 985b63a1eb3de18d4d1a741b315ed261f03f3260 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 06:47:16 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Fix:=20=E4=B8=BB=E6=9C=8D=E5=8A=A1=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E8=84=9A=E6=9C=AC=E8=A1=A5=E5=85=85=E5=90=88=E7=90=86?= =?UTF-8?q?=E7=9A=84pvc=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_eulercopilot.sh | 102 +++++++++++++++++- 1 file changed, 97 insertions(+), 5 deletions(-) diff --git a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh index 778d3fbd2..4c0cd90a3 100755 --- a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh +++ b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh @@ -739,20 +739,49 @@ uninstall_eulercopilot() { echo -e "${YELLOW}未找到需要清理的Helm Release: euler-copilot${NC}" fi - # 删除 PVC: framework-semantics-claim 和 web-static + # 强制清理PVC（改进版本） + echo -e "${BLUE}开始强制清理PVC...${NC}" local pvc_names=("framework-semantics-claim" "web-static") for pvc_name in "${pvc_names[@]}"; do if kubectl get pvc "$pvc_name" -n euler-copilot &>/dev/null; then - echo -e "${GREEN}找到PVC: ${pvc_name}，开始清理...${NC}" - if ! kubectl delete pvc "$pvc_name" -n euler-copilot --force --grace-period=0; then - echo -e "${RED}错误：删除PVC ${pvc_name} 失败！${NC}" >&2 - return 1 + echo -e "${GREEN}强制清理PVC: ${pvc_name}...${NC}" + + # 先尝试移除finalizer + kubectl patch pvc "$pvc_name" -n euler-copilot -p '{"metadata":{"finalizers":null}}' 2>/dev/null || true + + # 强制删除PVC + kubectl delete pvc "$pvc_name" -n euler-copilot --force --grace-period=0 2>/dev/null || true + + # 等待确认删除 + local timeout=30 + local count=0 + while kubectl get pvc "$pvc_name" -n euler-copilot &>/dev/null && [ $count -lt $timeout ]; do + echo -e "${YELLOW}等待PVC ${pvc_name} 删除完成...${NC}" + sleep 1 + ((count++)) + done + + if kubectl get pvc "$pvc_name" -n euler-copilot &>/dev/null; then + echo -e "${YELLOW}警告：PVC ${pvc_name} 删除超时，但继续执行${NC}" + else + echo -e "${GREEN}PVC ${pvc_name} 删除成功${NC}" fi else echo -e "${YELLOW}未找到需要清理的PVC: ${pvc_name}${NC}" fi done + # 清理可能存在的PV + echo -e "${BLUE}检查并清理相关PV...${NC}" + local pv_names=("framework-semantics" "web-static-pv") + for pv_name in "${pv_names[@]}"; do + if kubectl get pv "$pv_name" &>/dev/null; then + echo -e "${GREEN}清理PV: ${pv_name}...${NC}" + kubectl patch pv "$pv_name" -p '{"metadata":{"finalizers":null}}' 2>/dev/null || true + kubectl delete pv "$pv_name" --force --grace-period=0 2>/dev/null || true + fi + done + # 删除 Secret: euler-copilot-system local secret_name="euler-copilot-system" if kubectl get secret "$secret_name" -n euler-copilot &>/dev/null; then @@ -765,9 +794,69 @@ uninstall_eulercopilot() { echo -e "${YELLOW}未找到需要清理的Secret: ${secret_name}${NC}" fi + # 等待所有资源完全清理 + echo -e "${BLUE}等待资源完全清理...${NC}" + sleep 5 + echo -e "${GREEN}资源清理完成${NC}" } +# PVC冲突预检查机制 +check_pvc_conflicts() { + echo -e "${BLUE}检查PVC冲突...${NC}" + + local conflicts_found=false + + # 检查是否存在冲突的PVC绑定 + if kubectl get pvc web-static -n euler-copilot &>/dev/null; then + local bound_pv=$(kubectl get pvc web-static -n euler-copilot -o jsonpath='{.spec.volumeName}' 2>/dev/null) + if [ "$bound_pv" = "framework-semantics" ]; then + echo -e "${YELLOW}检测到PVC冲突：web-static绑定到了framework-semantics PV${NC}" + conflicts_found=true + fi + fi + + # 检查framework-semantics-claim是否绑定到错误的PV + if kubectl get pvc framework-semantics-claim -n euler-copilot &>/dev/null; then + local bound_pv=$(kubectl get pvc framework-semantics-claim -n euler-copilot -o jsonpath='{.spec.volumeName}' 2>/dev/null) + local pv_size=$(kubectl get pv "$bound_pv" -o jsonpath='{.spec.capacity.storage}' 2>/dev/null) + if [ "$pv_size" = "10Gi" ]; then + echo -e "${YELLOW}检测到PVC冲突：framework-semantics-claim绑定到了10Gi的PV（应该是5Gi）${NC}" + conflicts_found=true + fi + fi + + # 如果发现冲突，进行清理 + if [ "$conflicts_found" = true ]; then + echo -e "${YELLOW}发现PVC冲突，正在自动清理...${NC}" + + # 强制清理冲突的PVC + local pvc_names=("web-static" "framework-semantics-claim") + for pvc_name in "${pvc_names[@]}"; do + if kubectl get pvc "$pvc_name" -n euler-copilot &>/dev/null; then + echo -e "${GREEN}清理冲突PVC: ${pvc_name}${NC}" + kubectl patch pvc "$pvc_name" -n euler-copilot -p '{"metadata":{"finalizers":null}}' 2>/dev/null || true + kubectl delete pvc "$pvc_name" -n euler-copilot --force --grace-period=0 2>/dev/null || true + fi + done + + # 清理相关的pod + local framework_pod=$(kubectl get pods -n euler-copilot | grep framework | awk '{print $1}' | head -1) + if [ -n "$framework_pod" ]; then + echo -e "${GREEN}重启framework pod: ${framework_pod}${NC}" + kubectl delete pod "$framework_pod" -n euler-copilot 2>/dev/null || true + fi + + # 等待清理完成 + echo -e "${BLUE}等待冲突清理完成...${NC}" + sleep 10 + + echo -e "${GREEN}PVC冲突清理完成${NC}" + else + echo -e "${GREEN}未发现PVC冲突${NC}" + fi +} + modify_yaml() { local host=$1 local preserve_models=$2 # 新增参数，指示是否保留模型配置 @@ -925,6 +1014,9 @@ main() { uninstall_eulercopilot + # 检查PVC冲突（在重新部署前） + check_pvc_conflicts + if ! get_client_info_auto; then get_client_info_manual fi -- Gitee From 7443f3dbf4e8531d793b5418cd88ad6c9d2bf8e2 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 06:52:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Fix:=20values.yaml=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=8F=8Cpv=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/chart/euler_copilot/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/chart/euler_copilot/values.yaml b/deploy/chart/euler_copilot/values.yaml index 330110d1d..fc189dcea 100644 --- a/deploy/chart/euler_copilot/values.yaml +++ b/deploy/chart/euler_copilot/values.yaml @@ -111,12 +111,14 @@ ports: storage: # 语义接口 frameworkSemantics: - # 语义接口地址 + # 语义接口存储路径，默认为/var/lib/eulercopilot/semantics path: # 语义接口存储大小，默认为5GB size: # 共享存储 webAsset: + # 前后端共享存储路径，默认为/var/lib/eulercopilot/static + path: # 前后端共享存储大小，默认为10GB size: -- Gitee From 3bd4d77415e2b3ae99f8485a997ec86d11d7eb79 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 07:10:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?Fix:=20=E9=BB=98=E8=AE=A4values=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/chart/euler_copilot/values.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/deploy/chart/euler_copilot/values.yaml b/deploy/chart/euler_copilot/values.yaml index fc189dcea..20ccc675f 100644 --- a/deploy/chart/euler_copilot/values.yaml +++ b/deploy/chart/euler_copilot/values.yaml @@ -56,18 +56,17 @@ models: # [必填] reranker接口类型：["guijiliudong", "bailian", "v1lm", "assecend"] type: # [必填] reranker URL（需要带上“/v1/rerank”后缀） - endpoint: + endpoint: # [必填] reranker 模型API Key key: # [必填] reranker 模型名称 name: # [必填] reranker 模型icon URL icon: - # 登录设置 login: # [必填] 登录提供者类型：["authhub", "authelia"] - provider: authhub + provider: # AuthHub客户端ID设置，仅在provider为authhub时有效 client: # [必填] 客户端ID @@ -112,15 +111,15 @@ storage: # 语义接口 frameworkSemantics: # 语义接口存储路径，默认为/var/lib/eulercopilot/semantics - path: + path: /var/lib/eulercopilot/semantics # 语义接口存储大小，默认为5GB - size: + size: 5Gi # 共享存储 webAsset: # 前后端共享存储路径，默认为/var/lib/eulercopilot/static - path: + path: /var/lib/eulercopilot/static # 前后端共享存储大小，默认为10GB - size: + size: 10Gi euler_copilot: # 配置文件工具 -- Gitee From 40200372dccc81825ec9fbee2556f2b92c9bd091 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 28 Oct 2025 07:11:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?Fix:=20=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?web-storage=E9=81=BF=E5=85=8DPVC=E5=85=B1=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../euler_copilot/templates/web/web-storage.yaml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 deploy/chart/euler_copilot/templates/web/web-storage.yaml diff --git a/deploy/chart/euler_copilot/templates/web/web-storage.yaml b/deploy/chart/euler_copilot/templates/web/web-storage.yaml deleted file mode 100644 index a3d7c11e4..000000000 --- a/deploy/chart/euler_copilot/templates/web/web-storage.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.euler_copilot.web.enabled -}} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: web-static - namespace: {{ .Release.Namespace }} -spec: - storageClassName: {{ default "local-path" .Values.globals.storageClass }} - accessModes: - - ReadWriteOnce - resources: - requests: - storage: {{ default "10Gi" .Values.storage.webAsset.size }} - volumeName: web-static -{{- end -}} \ No newline at end of file -- Gitee