From fcead75d208d95a78968dd1414c17e77a070a1d3 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 30 Jul 2025 09:57:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dchat=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=85=8D=E7=BD=AE=E5=92=8CJenkins=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复默认values.yaml中的端口配置不一致问题 - 统一所有环境使用8012端口 - 启用probes健康检查配置 - 修改Jenkins流水线使用Nicolas_log分支 - 确保chat服务能正确监听8012端口并响应健康检查 --- .../alpha/ci/freeleaps2-frontend/Jenkinsfile | 2 +- freeleaps/helm-pkg/chat/values.yaml | 31 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile b/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile index 7d8429cf..e7fc781b 100644 --- a/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile @@ -3,7 +3,7 @@ library 'first-class-pipeline' executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' - serviceGitBranch = 'dev' + serviceGitBranch = 'Nicolas_log' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/products/freeleaps.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-repos-gitea-credentails' diff --git a/freeleaps/helm-pkg/chat/values.yaml b/freeleaps/helm-pkg/chat/values.yaml index 9a25db66..f7aeaf5a 100644 --- a/freeleaps/helm-pkg/chat/values.yaml +++ b/freeleaps/helm-pkg/chat/values.yaml @@ -22,7 +22,7 @@ chat: imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8007 + containerPort: 8012 protocol: TCP resources: requests: @@ -31,13 +31,30 @@ chat: limits: cpu: "1" memory: "1Gi" - # FIXME: Wait until the developers implements the probes APIs - probes: {} + probes: + liveness: + type: httpGet + config: + path: /api/_/livez + port: 8012 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 3 + readiness: + type: httpGet + config: + path: /api/_/readyz + port: 8012 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 3 + failureThreshold: 3 services: - name: chat-service type: ClusterIP - port: 8007 - targetPort: 8007 + port: 8012 + targetPort: 8012 serviceMonitor: enabled: false labels: @@ -55,7 +72,7 @@ chat: # SERVICE_API_ACCESS_HOST serviceApiAccessHost: "0.0.0.0" # SERVICE_API_ACCESS_PORT - serviceApiAccessPort: "8013" + serviceApiAccessPort: "8012" # MONGODB_NAME mongodbName: "" # MONGODB_URI @@ -107,7 +124,7 @@ chat: # METRICS_ENABLED metricsEnabled: "false" # PROBES_ENABLED - probesEnabled: "false" + probesEnabled: "true" vpa: minAllowed: enabled: false