Skip to content

Commit

Permalink
feat: Optimize openim helm charts to support v3.6 server deployment (#89
Browse files Browse the repository at this point in the history
)

* 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
  • Loading branch information
cubxxw authored Mar 12, 2024
1 parent b104ae6 commit 6523157
Show file tree
Hide file tree
Showing 27 changed files with 368 additions and 123 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/helm-charts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
# nfs
helm install nfs-subdir-external-provisioner ./infra/nfs-subdir-external-provisioner/ -f infra/nfs-subdir-external-provisioner/config.yaml -n kube-system
continue-on-error: true

- name: Install OpenIM Middleware
run: |
# Install MySQL
Expand Down
11 changes: 8 additions & 3 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ OpenIM 的Kubernetes 系统的helm chart部署脚本,一共分三部分,一

目前最新版本如下:
服务 chart-version imageVersion
openim-server 0.1.2 release-v3.5
openim-chat 0.1.2 release-V1.5
openim-server 0.1.2 release-v3.6
openim-chat 0.1.2 release-v1.6
openim-admin 0.1.2 toc-base-open-k8s.35
openim-web 0.1.1 preview-k8s

**关于helm chart版本管理**

+ [版本管理](./docs/contrib/version-zh.md)

## 系统要求

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


## 怎么使用 grafana
[docs/user-guider-zh.md](docs/user-guide-zh.md)
[docs/user-guider-zh.md](docs/contrib/user-guide-zh.md)
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ The latest version is as follows:

```bash
service chart-version imageVersion
openim-server 0.1.2 release-v3.5
openim-chat 0.1.2 release-V1.5
openim-server 0.1.2 release-v3.6
openim-chat 0.1.2 release-v1.6
openim-admin 0.1.2 toc-base-open-k8s.35
openim-web 0.1.1 preview-k8s
```

**About helm charts version management**

+ [version management](./docs/contrib/version.md)

## Prerequisites

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

## How to use grafana
[docs/user-guider.md](docs/user-guide.md)


[docs/user-guider.md](docs/contrib/user-guide.md)
4 changes: 2 additions & 2 deletions charts/openim-admin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

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

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

Expand Down
4 changes: 2 additions & 2 deletions charts/openim-chat/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

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

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

Expand Down
4 changes: 2 additions & 2 deletions charts/openim-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

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

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

Expand Down
4 changes: 2 additions & 2 deletions charts/openim-web/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

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

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

Expand Down
83 changes: 52 additions & 31 deletions config-chatserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,6 @@ config:
openImAdminName: openimchat-admin-rpc:80
openImChatName: openimchat-chat-rpc:80

# 没有配置表示和OpenIM一致
mysql:
address: [ im-mysql:3306 ] #目前仅支持单机
username: root #用户名
password: openIM123 #密码
#database: openIM_v2 #不建议修改
maxOpenConn: 1000 #最大连接数
maxIdleConn: 100 #最大空闲连接数
maxLifeTime: 60 #连接可以重复使用的最长时间(秒)
logLevel: 4 #日志级别 1=slient 2=error 3=warn 4=info
slowThreshold: 500 #慢语句阈值 (毫秒)
database: openim_enterprise

# 没有配置表示和OpenIM一致
log:
storageLocation: ../logs/ #存放目录
Expand All @@ -55,39 +42,73 @@ config:
tokenPolicy:
expire: 86400

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

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

adminList:
- adminID: admin1
nickname: chat1
imAdmin: openIM123456
- adminID: admin2
nickname: chat2
imAdmin: openIM654321
- adminID: admin3
nickname: chat3
imAdmin: openIMAdmin
- adminID:
nickname:
imAdmin:
- adminID:
nickname:
imAdmin:
- adminID:
nickname:
imAdmin:

chatAdmin:
- adminID: chatAdmin
nickname: chatAdmin
imAdmin: imAdmin

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

redis:
address: [ im-redis-master:6379 ]
username: ''
password: openIM123
username:
password: openIM123

# liveKit:
# liveKitUrl: "ws://172.28.0.1:7880" # LIVEKIT_URL, LiveKit server address and port
# key: "APIDXJxJeCL8haY" # LIVEKIT_API_KEY
# secret: "ak1qulJ3nfXeflQHWBdmQDc4js4ueMc5OnxoORVJC2xA" # LIVEKIT_API_SECRET

mongo:
uri: ''

# List of MongoDB server addresses.
# Used for constructing the MongoDB URI if 'uri' above is empty.
# For a standalone setup, specify the address of the single server.
# For a sharded cluster, specify the addresses of the Mongos servers.
# Example: [ '172.28.0.1:37017', '172.28.0.2:37017' ]
# Default MongoDB database name
# Maximum connection pool size
address: [ im-mongodb:27017 ]
database: openim_v3
username: openIM
password: openIM123
maxPoolSize: 100
Loading

0 comments on commit 6523157

Please sign in to comment.