From e3a8d12d4b50b47af779b6ae903e6da1840d64cf Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 17:19:53 +0800 Subject: [PATCH 1/6] k8s deploy --- deploy_k8s/sdk_server/deployment.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 0b6254bd4..2c94f177d 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -22,10 +22,18 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + - name: localDB + 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: localDB + hostPath: + path: /db/sdk + type: Directory strategy: #更新策略 type: RollingUpdate # 滚动更新 --- From 4287082f4b26ca63868a0d8ec8e2b9fbeb89b857 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 17:22:27 +0800 Subject: [PATCH 2/6] k8s deploy --- deploy_k8s/sdk_server/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 2c94f177d..baffb9eab 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -22,7 +22,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: localDB + - 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"] @@ -30,7 +30,7 @@ spec: - name: config configMap: name: config - - name: localDB + - name: local-db hostPath: path: /db/sdk type: Directory From b5ceec48834741be494d9688ed03c598915182f5 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 17:40:04 +0800 Subject: [PATCH 3/6] k8s deploy --- deploy_k8s/sdk_server/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index baffb9eab..7bec639b5 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -33,7 +33,6 @@ spec: - name: local-db hostPath: path: /db/sdk - type: Directory strategy: #更新策略 type: RollingUpdate # 滚动更新 --- From b3525ea6a5062fcc6bc0ff03f5e7689999c08467 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 17:56:29 +0800 Subject: [PATCH 4/6] k8s deploy --- deploy_k8s/sdk_server/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 7bec639b5..2a01b20c0 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -25,7 +25,7 @@ spec: - 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"] + args: ["openIM_api_port", "10002", "openIM_ws_port", "10001", "sdk_ws_port", "10003", "openIM_log_level", "6"] volumes: - name: config configMap: From 79b2d39305cd9671cffa9bfe5e320bfe228bfe19 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 18:04:51 +0800 Subject: [PATCH 5/6] k8s deploy --- deploy_k8s/sdk_server/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 2a01b20c0..7bec639b5 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -25,7 +25,7 @@ spec: - 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"] + args: ["-openIM_api_port", "10002", "-openIM_ws_port", "10001", "-sdk_ws_port", "10003", "-openIM_log_level", "6"] volumes: - name: config configMap: From 6ffc12ef9713a0f5672a81bdc8ae098ef504e548 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 23 May 2022 19:14:29 +0800 Subject: [PATCH 6/6] k8s deploy --- config/config.yaml | 2 ++ deploy_k8s/k8s_openim_deploy.md | 2 ++ deploy_k8s/kubectl_start_all.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/config/config.yaml b/config/config.yaml index 1cfee4e1d..643ee88a4 100644 --- a/config/config.yaml +++ b/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用户名，建议修改 diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 1897b9a47..57f85600a 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/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配置文件 域名修改等操作 diff --git a/deploy_k8s/kubectl_start_all.sh b/deploy_k8s/kubectl_start_all.sh index 6fc90af7c..ddb7743f1 100644 --- a/deploy_k8s/kubectl_start_all.sh +++ b/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