feat: platform-manager新增tls配置

Author: LidolLxf

bcs-services/bcs-platform-manager/pkg/constants/constant.go

@@ -17,7 +17,7 @@ const (
 	// ClusterManagerServiceName cluster manager service name
 	ClusterManagerServiceName = "clustermanager.bkbcs.tencent.com"
 	// ProjectManagerServiceName project manager service name
-	ProjectManagerServiceName = "projectmanager.bkbcs.tencent.com"
+	ProjectManagerServiceName = "project.bkbcs.tencent.com"
 	// ServiceDomain domain name for service
 	ServiceDomain = "platformmanager.bkbcs.tencent.com"
 )

bcs-services/bcs-platform-manager/pkg/cron/client/client.go

@@ -45,7 +45,6 @@ func NewScheduler() (*asynq.Scheduler, error) {
 
 // NewCronTasks create cron tasks
 func NewCronTasks() ([]*task.CronTask, error) {
-	blog.Info("create schedule task: cron job")
 	cronTasks := []*task.CronTask{}
 	var err error
 	var cronTask *task.CronTask

install/helm/bcs-platform-manager/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: bcs-platform-manager
 description: 蓝鲸容器服务 bcs-services/bcs-platform-manager 模块
 type: application
-version: v1.29.12
-appVersion: v1.29.12
+version: v1.29.13
+appVersion: v1.29.13
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

install/helm/bcs-platform-manager/README.md

@@ -54,7 +54,8 @@ image:
 ```yaml
 svcConf:
   redis:
-    address: "127.0.0.1:6379"
+    host: "bcs-redis-master"
+    port: 6379
     db: 0
     ## 为空则从环境变量获取
     password: "your_redis_password"
@@ -150,6 +151,15 @@ svcConf:
     enabled: false
     endpoint: ""
     token: ""
+
+  ## tls 配置
+  tls_conf:
+    server_cert: "/data/bcs/cert/bcs/bcs-server.crt"
+    server_key: "/data/bcs/cert/bcs/bcs-server.key"
+    server_ca: "/data/bcs/cert/bcs/bcs-ca.crt"
+    client_cert: "/data/bcs/cert/bcs/bcs-client.crt"
+    client_key: "/data/bcs/cert/bcs/bcs-client.key"
+    client_ca: "/data/bcs/cert/bcs/bcs-ca.crt"
 ```
 
 ### 部署 Chart

install/helm/bcs-platform-manager/templates/deployment.yaml

@@ -45,13 +45,9 @@ spec:
           env:
             {{- include "bcs-platform-manager.envs" . | trim | nindent 12 }}
           livenessProbe:
-            httpGet:
-              path: /-/healthy
-              port: http
+            {{- toYaml .Values.probe.liveness | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /-/ready
-              port: http
+            {{- toYaml .Values.probe.readiness | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

install/helm/bcs-platform-manager/values.yaml

@@ -61,6 +61,11 @@ resources:
     cpu: 2
     memory: 1Gi
 
+## 健康检查
+probe:
+  liveness: 
+  readiness:
+
 ## 环境变量
 envs: {}
 
@@ -77,7 +82,7 @@ svcConf:
 
   ## 基础相关配置
   base_conf:
-    http_port: 8099
+    http_port: 8080
     bind_address: ""
     app_code: ""
     app_secret: ""
@@ -102,7 +107,8 @@ svcConf:
 
   ## Redis 配置信息
   redis:
-    address: "bcs-redis-master:6379"
+    host: "bcs-redis-master"
+    port: 6379
     db: 2
     password: ""
     ## 以下项非必须可不启用
@@ -128,6 +134,13 @@ svcConf:
     endpoint: ""
     token: ""
 
+  tls_conf:
+    server_cert: "/data/bcs/cert/bcs/bcs-server.crt"
+    server_key: "/data/bcs/cert/bcs/bcs-server.key"
+    server_ca: "/data/bcs/cert/bcs/bcs-ca.crt"
+    client_cert: "/data/bcs/cert/bcs/bcs-client.crt"
+    client_key: "/data/bcs/cert/bcs/bcs-client.key"
+    client_ca: "/data/bcs/cert/bcs/bcs-ca.crt"
 ## 挂载的 server. etcd cert 和 jwt key 对应的 secret 名称
 secret:
   bcsServerCerts: bcs-server-certs
@@ -179,8 +192,8 @@ service:
   type: ClusterIP
   ports:
     - name: http
-      port: 8099
-      targetPort: 8099
+      port: 8080
+      targetPort: 8080
       protocol: TCP
 
 ## 权限控制类