From f2dffef5bad7468d8f0fc3d3b54d28d12755a091 Mon Sep 17 00:00:00 2001 From: Ethan-Zhang Date: Tue, 21 Oct 2025 16:28:10 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E9=89=B4=E6=9D=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E9=BB=98=E8=AE=A4=E5=80=BC=E9=87=87=E7=94=A8?= =?UTF-8?q?values=E9=85=8D=E7=BD=AE=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configs/framework/config-authelia.toml | 12 ++++++------ .../euler_copilot/configs/framework/config.toml | 2 +- .../8-install-EulerCopilot/install_eulercopilot.sh | 6 ++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/deploy/chart/euler_copilot/configs/framework/config-authelia.toml b/deploy/chart/euler_copilot/configs/framework/config-authelia.toml index 5a962d525..dabc3a43f 100644 --- a/deploy/chart/euler_copilot/configs/framework/config-authelia.toml +++ b/deploy/chart/euler_copilot/configs/framework/config-authelia.toml @@ -12,17 +12,17 @@ data_dir = '/app/data' provider = 'authelia' [login.settings] # Authelia OIDC 服务器配置 -host = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}' +host = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}' client_id = '{{ .Values.login.authelia.client_id | default "euler-copilot" }}' client_secret = '{{ .Values.login.authelia.client_secret | default "your-client-secret-here" }}' # OIDC 端点配置 redirect_uri = '{{ .Values.domain.euler_copilot | default "http://127.0.0.1:30080" }}/api/auth/login' -authorization_endpoint = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}/api/oidc/authorization' -token_endpoint = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}/api/oidc/token' -userinfo_endpoint = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}/api/oidc/userinfo' -jwks_uri = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}/.well-known/jwks.json' -issuer = '{{ .Values.domain.authelia | default "http://127.0.0.1:30091" }}' +authorization_endpoint = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}/api/oidc/authorization' +token_endpoint = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}/api/oidc/token' +userinfo_endpoint = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}/api/oidc/userinfo' +jwks_uri = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}/.well-known/jwks.json' +issuer = '{{ .Values.domain.authelia | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authelia | default 30091)) }}' # OIDC 作用域和声明配置 scopes = 'openid profile email groups' diff --git a/deploy/chart/euler_copilot/configs/framework/config.toml b/deploy/chart/euler_copilot/configs/framework/config.toml index da6671185..d6b46d3d0 100644 --- a/deploy/chart/euler_copilot/configs/framework/config.toml +++ b/deploy/chart/euler_copilot/configs/framework/config.toml @@ -20,7 +20,7 @@ userinfo_endpoint = '{{ .Values.domain.authelia | default "http://127.0.0.1:3009 scopes = 'openid profile email' {{- else }} [login.settings] -host = '{{ .Values.domain.authhub | default "http://127.0.0.1:30081" }}' +host = '{{ .Values.domain.authhub | default (printf "%s:%d" (.Values.domain.euler_copilot | default "http://127.0.0.1") (.Values.ports.authhub | default 30081)) }}' host_inner = 'http://authhub-backend-service.{{ .Release.Namespace }}.svc.cluster.local:11120' login_api = '{{ .Values.domain.euler_copilot | default "http://127.0.0.1:30080" }}/api/auth/login' app_id = '${clientId}' diff --git a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh index 0ead5da58..866b27bb4 100755 --- a/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh +++ b/deploy/scripts/8-install-EulerCopilot/install_eulercopilot.sh @@ -344,10 +344,8 @@ modify_yaml() { "--set" "domain.euler_copilot=${eulercopilot_address}" ) - # 如果检测到了鉴权服务地址，则添加到配置中 - if [ -n "$auth_service_address" ]; then - set_args+=("--set" "domain.auth_service=${auth_service_address}") - fi + # 注意：authhub和authelia的域名将通过Helm模板自动构建 + # 不再需要在这里手动设置domain.authhub和domain.authelia # 如果不需要保留模型配置，则添加模型相关的参数 if [[ "$preserve_models" != [Yy]* ]]; then -- Gitee