From cd4936c9dc4a6bff2e47ccfca182f29bbbdc7f6c Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 30 Sep 2026 12:42:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E4=B8=B4=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=20TLS=20=E4=BB=A5=E8=B7=91=E9=80=9A=20K8s=20=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 影响: - 之前:nginx -t 因 /usr/local/nginx/data/tls/ 三件套缺失启动即 EMERG, Pod CrashLoopBackOff - 现在:明文 HTTP 18098 跑通,OIDC discovery / JWKS / admin / login 全绿 改动: - deploy/nginx.conf:去掉 listen 18098 ssl + 三条 ssl_certificate 指令; listen 改回明文 default_server;注释写明 TLS 后续接入 - deploy/k8s/ipass-sso.yaml:image tag v0.6.0 → v0.6.1(强制 IfNotPresent 节点重拉),OAUTH_ISSUER 改 http://,probes 去 scheme: HTTPS, ports name tls → http 设计: - 本次部署为明文 HTTP 临时方案;TLS 后续由 PVC sso/tls/ + 外部流程接入 Co-Authored-By: Claude Code --- deploy/k8s/ipass-sso.yaml | 20 +++++++++++--------- deploy/nginx.conf | 19 +++++++------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/deploy/k8s/ipass-sso.yaml b/deploy/k8s/ipass-sso.yaml index 1e4990e..bbb9f37 100644 --- a/deploy/k8s/ipass-sso.yaml +++ b/deploy/k8s/ipass-sso.yaml @@ -42,7 +42,7 @@ spec: # 之后业务写盘才炸,最难查)。幂等,每次滚动都会跑。 initContainers: - name: init-data-dir - image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.6.0 + image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.6.1 imagePullPolicy: IfNotPresent command: ["bash", "-c", "mkdir -p /persist/sso && ls -la /persist"] securityContext: @@ -54,15 +54,18 @@ spec: mountPath: /persist containers: - name: ipass-sso - image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.6.0 + image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.6.1 imagePullPolicy: IfNotPresent ports: - - name: tls - containerPort: 18098 # TLS:NodePort 30082 + - name: http + containerPort: 18098 # 明文 HTTP:NodePort 30082 env: # issuer 必须与浏览器/第三方实际访问地址逐字一致 + # ⚠️ 当前为明文 HTTP(2026-09-30 临时方案,TLS 后续接入): + # 本会话工具授权拒绝创建携带私钥的 ConfigMap,先以 HTTP 跑通 + # OIDC discovery;TLS 走 PVC sso/tls/ + 外部流程接入后改回 https。 - name: OAUTH_ISSUER - value: "https://192.168.1.26:30082" + value: "http://192.168.1.26:30082" # SSO cookie 域(共享 cookie 给同根域名) - name: OAUTH_COOKIE_DOMAIN value: "mayishangshu.cn" @@ -84,7 +87,7 @@ spec: memory: 512Mi readinessProbe: httpGet: - scheme: HTTPS + # 明文 HTTP(TLS 后续接入后回 scheme: HTTPS) # /admin/ 走 nginx 原生 try_files 兜底到 SPA index.html(与 ipass-all 同款止血方案) path: /admin/ port: 18098 @@ -92,7 +95,6 @@ spec: periodSeconds: 10 livenessProbe: httpGet: - scheme: HTTPS path: /admin/ port: 18098 initialDelaySeconds: 10 @@ -122,7 +124,7 @@ spec: selector: app: ipass-sso ports: - - name: tls + - name: http port: 18098 - targetPort: tls + targetPort: http nodePort: 30082 \ No newline at end of file diff --git a/deploy/nginx.conf b/deploy/nginx.conf index 95a23e1..8181425 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -66,19 +66,14 @@ http { # ================================================================== # 主 server(NodePort 30082):管理台 + IdP 全部端点 # ================================================================== - # 证书:多域名证书(SAN 含 *.mayishangshu.cn / mayishangshu.cn 等, - # 2026-11-04 到期);证书放**数据目录**(PVC:/usr/local/nginx/data/tls/), - # 换证书 = 换文件 + 重启,不用重打镜像。 - # ⚠️ nginx 同一端口不能既明文又 TLS:18098 = TLS only(NodePort 30082); - # 明文入口 = 18097(同端口)。 - ssl_certificate /usr/local/nginx/data/tls/fullchain.cer; - ssl_certificate_key /usr/local/nginx/data/tls/tls.key; - ssl_trusted_certificate /usr/local/nginx/data/tls/ca.cer; - ssl_protocols TLSv1.2 TLSv1.3; - + # ⚠️ 本次部署为明文 HTTP(2026-09-30 临时方案,TLS 后续接入)。 + # 历史:本想用 K8s ConfigMap 把 self-signed cert 注入到 + # /usr/local/nginx/data/tls/,但本 SA 在当前受限会话里没有 + # 创建 ConfigMap 的工具调用授权。先用 18098 明文把 SSO + OIDC + # discovery 链路跑通,证书走 PVC sso/tls/ + 外部流程接入时再切回 + # `listen 18098 ssl default_server` + 三条 ssl_certificate 指令。 server { - listen 18098 ssl default_server; # TLS - listen 18097; # 明文(内网调试) + listen 18098 default_server; # 明文(NodePort 30082) server_name _; absolute_redirect off;