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

config/config.yaml

@@ -7,6 +7,8 @@ etcd:
   etcdSchema: openim  #默认即可
   etcdAddr: [ 127.0.0.1:2379 ] #单机部署时，默认即可
 
+k8sMod: false #开启k8s模式 使用pod里面环境变量请求services调用服务 而并非etcd
+
 mysql:
   dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可
   dbMysqlUserName: root #mysql用户名，建议修改

deploy_k8s/k8s_openim_deploy.md

@@ -19,6 +19,8 @@ nodeSelector:
 修改每种服务数量，建议至少每种2个rpc。
 如果修改了config/config.yaml某些配置比如端口，同时需要修改对应deployment端口
 
+jssdk 需要在sdk_server/deployment.yaml修改启动端口等
+
 ### 4. 修改ingress.yaml配置文件
 域名修改等操作
 

deploy_k8s/kubectl_start_all.sh

@@ -2,6 +2,8 @@
 
 source ./path_info.cfg
 
+mkdir -p /db/sdk #path for jssdk sqlite
+
 for i in ${service[*]}
 do
   kubectl -n openim apply -f ./${i}/deployment.yaml

deploy_k8s/sdk_server/deployment.yaml

@@ -22,10 +22,17 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+          - name: local-db
+            mountPath: /db/sdk
+        command: ["/Open-IM-Server/main"]
+        args: ["-openIM_api_port", "10002", "-openIM_ws_port", "10001", "-sdk_ws_port", "10003", "-openIM_log_level", "6"]
       volumes:
         - name: config
           configMap:
             name: config
+        - name: local-db
+          hostPath:
+            path: /db/sdk
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---