Merge remote-tracking branch 'origin/tuoyun' into tuoyun

deploy_k8s/ingress.yaml

@@ -3,13 +3,14 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/proxy-http-version: "1.1"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
   name: sdk-server-ingress
 spec:
   rules:
-    - host: k8s.open-im-test.rentsoft.cn
+    - host: sdk-server.openim.xxx.com
       http:
         paths:
           - backend:
@@ -17,20 +18,21 @@ spec:
                 name: sdk-server
                 port:
                   number: 10003
-            path: /sdk-server
+            path: /
             pathType: Prefix
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/proxy-http-version: "1.1"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
   name: msg-gateway-ingress
 spec:
   rules:
-    - host: k8s.open-im-test.rentsoft.cn
+    - host: msg-gateway.openim.xxx.com
       http:
         paths:
           - backend:
@@ -38,16 +40,18 @@ spec:
                 name: msg-gateway
                 port:
                   number: 10001
-            path: /msg-gateway
+            path: /
             pathType: Prefix
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
   name: api-ingress
 spec:
   rules:
-    - host: k8s.open-im-test.rentsoft.cn
+    - host: api.openim.xxx.com
       http:
         paths:
           - backend:
@@ -55,16 +59,18 @@ spec:
                 name: api
                 port:
                   number: 10002
-            path: /api
+            path: /
             pathType: Prefix
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
   name: demo-ingress
 spec:
   rules:
-    - host: k8s.open-im-test.rentsoft.cn
+    - host: demo.openim.xxx.com
       http:
         paths:
           - backend:
@@ -72,16 +78,18 @@ spec:
                 name: demo
                 port:
                   number: 10004
-            path: /demo
+            path: /
             pathType: Prefix
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
   name: cms-api-ingress
 spec:
   rules:
-    - host: k8s.open-im-test.rentsoft.cn
+    - host: cms-api.openim.xxx.com
       http:
         paths:
           - backend:
@@ -89,5 +97,5 @@ spec:
                 name: cms-api
                 port:
                   number: 10006
-            path: /cms-api
+            path: /
             pathType: Prefix

deploy_k8s/k8s_openim_deploy.md

@@ -17,20 +17,21 @@ nodeSelector:
   node: kube-Node
 创建资源清单时添加上nodeSelector属性对应即可
 修改每种服务数量，建议至少每种2个rpc。
-如果修改了config/config.yaml某些配置比如端口，同时需要修改对应deployment端口
+如果修改了config/config.yaml某些配置比如端口，同时需要修改对应deployment端口和ingress端口
 
-jssdk 需要在sdk_server/deployment.yaml修改启动端口等
 
 ### 4. 修改ingress.yaml配置文件
-域名修改等操作
+需要安装ingress controller 这里使用的是ingress-nginx 其他ingress需要修改配置文件
+进行域名修改等操作
 
 ### 5. 执行./kubectl_start.sh脚本
 chmod +x ./kubectl_start.sh ./kubectl_stop.sh
 ./kubectl_start.sh
+kubectl -n openim apply -f ingress.yaml
 kubectl 启动所有deployment，services，ingress
 
 ### 6. 查看k8s deployment service ingress状态
 kubectl -n openim get services
 kubectl -n openim get deployment
 kubectl -n openim get ingress
-kubectl -n openim get pods
+kubectl -n openim get pods

internal/rpc/group/group.go

@@ -379,11 +379,11 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 	}
 
 	for _, v := range memberList {
-		log.Debug(req.OperationID, v)
+		//log.Debug(req.OperationID, v)
 		var node open_im_sdk.GroupMemberFullInfo
 		cp.GroupMemberDBCopyOpenIM(&node, &v)
-		log.Debug(req.OperationID, "db value:", v.MuteEndTime, "seconds: ", v.MuteEndTime.Unix())
-		log.Debug(req.OperationID, "cp value: ", node)
+		//log.Debug(req.OperationID, "db value:", v.MuteEndTime, "seconds: ", v.MuteEndTime.Unix())
+		//log.Debug(req.OperationID, "cp value: ", node)
 		resp.MemberList = append(resp.MemberList, &node)
 	}
 	log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String())