Skip to content

Commit 6523157

Browse files
authored
feat: Optimize openim helm charts to support v3.6 server deployment (#89)
* feat: fix openim helm charts bug * feat: fix openim helm charts bug * fix: fix openim mongo password * fix: fix openim mongo password * fix: fix openim mongo password * fix: fix openim mongo password
1 parent b104ae6 commit 6523157

27 files changed

+368
-123
lines changed

.github/workflows/helm-charts-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
# nfs
4646
helm install nfs-subdir-external-provisioner ./infra/nfs-subdir-external-provisioner/ -f infra/nfs-subdir-external-provisioner/config.yaml -n kube-system
4747
48+
continue-on-error: true
49+
4850
- name: Install OpenIM Middleware
4951
run: |
5052
# Install MySQL

README-zh_CN.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ OpenIM 的Kubernetes 系统的helm chart部署脚本,一共分三部分,一
55

66
目前最新版本如下:
77
服务 chart-version imageVersion
8-
openim-server 0.1.2 release-v3.5
9-
openim-chat 0.1.2 release-V1.5
8+
openim-server 0.1.2 release-v3.6
9+
openim-chat 0.1.2 release-v1.6
1010
openim-admin 0.1.2 toc-base-open-k8s.35
1111
openim-web 0.1.1 preview-k8s
12+
13+
**关于helm chart版本管理**
14+
15+
+ [版本管理](./docs/contrib/version-zh.md)
16+
1217
## 系统要求
1318

1419
1. 系统环境要求
@@ -148,4 +153,4 @@ helm install openim-admin -f k8s-adminfront-config.yaml ./charts/openim-admin/ -
148153

149154

150155
## 怎么使用 grafana
151-
[docs/user-guider-zh.md](docs/user-guide-zh.md)
156+
[docs/user-guider-zh.md](docs/contrib/user-guide-zh.md)

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ The latest version is as follows:
66

77
```bash
88
service chart-version imageVersion
9-
openim-server 0.1.2 release-v3.5
10-
openim-chat 0.1.2 release-V1.5
9+
openim-server 0.1.2 release-v3.6
10+
openim-chat 0.1.2 release-v1.6
1111
openim-admin 0.1.2 toc-base-open-k8s.35
1212
openim-web 0.1.1 preview-k8s
1313
```
1414

15+
**About helm charts version management**
16+
17+
+ [version management](./docs/contrib/version.md)
18+
1519
## Prerequisites
1620

1721
1. System environment required
@@ -167,6 +171,4 @@ helm install openim-admin -f k8s-adminfront-config.yaml ./charts/openim-admin/ -
167171
```
168172

169173
## How to use grafana
170-
[docs/user-guider.md](docs/user-guide.md)
171-
172-
174+
[docs/user-guider.md](docs/contrib/user-guide.md)

charts/openim-admin/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.16
18+
version: 0.1.17
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.16.0"
24+
appVersion: "3.6.0"
2525

2626
home: https://github.com/openimsdk/helm-charts
2727

charts/openim-chat/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.16
18+
version: 0.1.17
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.16.0"
24+
appVersion: "1.6.0"
2525

2626
home: https://github.com/openimsdk/helm-charts
2727

charts/openim-server/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.16
18+
version: 0.1.17
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.16.0"
24+
appVersion: "3.6.0"
2525

2626
home: https://github.com/openimsdk/helm-charts
2727

charts/openim-web/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.16
18+
version: 0.1.17
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.16.0"
24+
appVersion: "3.6.0"
2525

2626
home: https://github.com/openimsdk/helm-charts
2727

config-chatserver.yaml

Lines changed: 52 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@ config:
2828
openImAdminName: openimchat-admin-rpc:80
2929
openImChatName: openimchat-chat-rpc:80
3030

31-
# 没有配置表示和OpenIM一致
32-
mysql:
33-
address: [ im-mysql:3306 ] #目前仅支持单机
34-
username: root #用户名
35-
password: openIM123 #密码
36-
#database: openIM_v2 #不建议修改
37-
maxOpenConn: 1000 #最大连接数
38-
maxIdleConn: 100 #最大空闲连接数
39-
maxLifeTime: 60 #连接可以重复使用的最长时间(秒)
40-
logLevel: 4 #日志级别 1=slient 2=error 3=warn 4=info
41-
slowThreshold: 500 #慢语句阈值 (毫秒)
42-
database: openim_enterprise
43-
4431
# 没有配置表示和OpenIM一致
4532
log:
4633
storageLocation: ../logs/ #存放目录
@@ -55,39 +42,73 @@ config:
5542
tokenPolicy:
5643
expire: 86400
5744

45+
# Verification code settings
5846
verifyCode:
59-
validTime: 300 # 验证码有效时间
60-
validCount: 5 # 验证码有效次数
61-
uintTime: 86400 # 单位时间间隔
62-
maxCount: 10 # 单位时间内最大获取次数
63-
superCode: "666666" # 超级验证码(只有use为空时使用)
64-
len: 6 # 验证码长度
65-
use: "" # 使用的验证码服务(use: "ali")
47+
validTime: 300 # Verification code valid time in seconds
48+
validCount: 5 # Number of times a verification code is valid
49+
uintTime: 86400 # Time unit for verification code
50+
maxCount: 10 # Maximum number of verification codes in a time unit
51+
superCode: "666666" # Super verification code (used only when `use` is empty)
52+
len: 6 # Length of the verification code
53+
use: "" # Service used for verification code (e.g., "ali")
54+
# Aliyun SMS service configuration
6655
ali:
6756
endpoint: "dysmsapi.aliyuncs.com"
6857
accessKeyId: ""
6958
accessKeySecret: ""
7059
signName: ""
7160
verificationCodeTemplateCode: ""
61+
# Email service configuration
62+
mail:
63+
title: ""
64+
senderMail: "" # Email address of the sender
65+
senderAuthorizationCode: "" # Authorization code for the sender's email
66+
smtpAddr: "smtp.qq.com" # SMTP server address
67+
smtpPort: 465 # SMTP server port for email sending
7268

7369
# 获取ip的header,没有配置直接获取远程地址
7470
#proxyHeader: "X-Forwarded-For"
7571

7672
adminList:
77-
- adminID: admin1
78-
nickname: chat1
79-
imAdmin: openIM123456
80-
- adminID: admin2
81-
nickname: chat2
82-
imAdmin: openIM654321
83-
- adminID: admin3
84-
nickname: chat3
85-
imAdmin: openIMAdmin
73+
- adminID:
74+
nickname:
75+
imAdmin:
76+
- adminID:
77+
nickname:
78+
imAdmin:
79+
- adminID:
80+
nickname:
81+
imAdmin:
8682

83+
chatAdmin:
84+
- adminID: chatAdmin
85+
nickname: chatAdmin
86+
imAdmin: imAdmin
8787

8888
openIMUrl: "http://openimserver-openim-api"
8989

9090
redis:
9191
address: [ im-redis-master:6379 ]
92-
username: ''
93-
password: openIM123
92+
username:
93+
password: openIM123
94+
95+
# liveKit:
96+
# liveKitUrl: "ws://172.28.0.1:7880" # LIVEKIT_URL, LiveKit server address and port
97+
# key: "APIDXJxJeCL8haY" # LIVEKIT_API_KEY
98+
# secret: "ak1qulJ3nfXeflQHWBdmQDc4js4ueMc5OnxoORVJC2xA" # LIVEKIT_API_SECRET
99+
100+
mongo:
101+
uri: ''
102+
103+
# List of MongoDB server addresses.
104+
# Used for constructing the MongoDB URI if 'uri' above is empty.
105+
# For a standalone setup, specify the address of the single server.
106+
# For a sharded cluster, specify the addresses of the Mongos servers.
107+
# Example: [ '172.28.0.1:37017', '172.28.0.2:37017' ]
108+
# Default MongoDB database name
109+
# Maximum connection pool size
110+
address: [ im-mongodb:27017 ]
111+
database: openim_v3
112+
username: openIM
113+
password: openIM123
114+
maxPoolSize: 100

0 commit comments

Comments
 (0)