diff --git a/.github/workflows/helm-charts-test.yml b/.github/workflows/helm-charts-test.yml index 5efaa6a..18e649a 100644 --- a/.github/workflows/helm-charts-test.yml +++ b/.github/workflows/helm-charts-test.yml @@ -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 diff --git a/README-zh_CN.md b/README-zh_CN.md index a0a85d8..7fc72c5 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -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. 系统环境要求 @@ -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) diff --git a/README.md b/README.md index 94f51da..6e3b9bc 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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) diff --git a/charts/openim-admin/Chart.yaml b/charts/openim-admin/Chart.yaml index 4d53501..0801333 100644 --- a/charts/openim-admin/Chart.yaml +++ b/charts/openim-admin/Chart.yaml @@ -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 diff --git a/charts/openim-chat/Chart.yaml b/charts/openim-chat/Chart.yaml index 95c8188..522504a 100644 --- a/charts/openim-chat/Chart.yaml +++ b/charts/openim-chat/Chart.yaml @@ -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 diff --git a/charts/openim-server/Chart.yaml b/charts/openim-server/Chart.yaml index ffd381b..0e9269e 100644 --- a/charts/openim-server/Chart.yaml +++ b/charts/openim-server/Chart.yaml @@ -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 diff --git a/charts/openim-web/Chart.yaml b/charts/openim-web/Chart.yaml index aec9124..f3c3a1a 100644 --- a/charts/openim-web/Chart.yaml +++ b/charts/openim-web/Chart.yaml @@ -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 diff --git a/config-chatserver.yaml b/config-chatserver.yaml index 2c77ef3..b03f66c 100644 --- a/config-chatserver.yaml +++ b/config-chatserver.yaml @@ -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/ #存放目录 @@ -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 \ No newline at end of file + 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 diff --git a/config-imserver.yaml b/config-imserver.yaml index a5a7224..f740bab 100644 --- a/config-imserver.yaml +++ b/config-imserver.yaml @@ -14,38 +14,25 @@ config: username: '' password: '' - ###################### Mysql ###################### - # MySQL configuration - # Currently, only single machine setup is supported - # - # Maximum number of open connections - # Maximum number of idle connections - # Maximum lifetime in seconds a connection can be reused - # Log level: 1=slient, 2=error, 3=warn, 4=info - # Slow query threshold in milliseconds - mysql: - address: [ im-mysql:3306 ] - username: root - password: openIM123 - database: openIM_v3 - maxOpenConn: 1000 - maxIdleConn: 100 - maxLifeTime: 60 - logLevel: 4 - slowThreshold: 500 - ###################### Mongo ###################### # MongoDB configuration - # If uri is not empty, it will be used directly - # - # MongoDB address for standalone setup, Mongos address for sharded cluster setup - # Default MongoDB database name - # Maximum connection pool size + + # If uri is not empty, it will be used directly for the MongoDB connection. + # This is a complete MongoDB URI string. + # Example: mongodb://user:password@host1:port1,host2:port2/dbname?options 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: root + database: openim_v3 + username: openIM password: openIM123 maxPoolSize: 100 @@ -122,11 +109,13 @@ config: secretAccessKey: "openIM123" sessionToken: '' signEndpoint: "https://openim1.server.top/im-minio-api" + publicRead: false cos: bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com secretID: '' secretKey: '' sessionToken: '' + publicRead: false oss: endpoint: "https://oss-cn-chengdu.aliyuncs.com" bucket: "demo-9999999" @@ -134,7 +123,22 @@ config: accessKeyID: '' accessKeySecret: '' sessionToken: '' - + publicRead: false + kodo: + endpoint: "http://s3.cn-east-1.qiniucs.com" + bucket: "demo-9999999" + bucketURL: "http://your.domain.com" + accessKeyID: '' + accessKeySecret: '' + sessionToken: '' + publicRead: false + aws: + endpoint: "''" # This might not be necessary unless you're using a custom endpoint + region: "us-east-1" + bucket: "demo-9999999" + accessKeyID: '' + accessKeySecret: '' + publicRead: false ###################### RPC Port Configuration ###################### # RPC service ports @@ -145,7 +149,7 @@ config: openImUserPort: [ 80 ] openImFriendPort: [ 80 ] openImMessagePort: [ 80 ] - openImMessageGatewayPort: [ 88 ] + openImMessageGatewayPort: [ 88 ] # This port is used for long connection openImGroupPort: [ 80 ] openImAuthPort: [ 80 ] openImPushPort: [ 80 ] @@ -227,8 +231,12 @@ config: # Built-in app manager user IDs # Built-in app manager nicknames manager: - userID: [ "openIM123456", "openIM654321", "openIMAdmin" ] - nickname: [ "system1", "system2", "system3" ] + userID: + nickname: + + im-admin: + userID: [ "imAdmin" ] + nickname: [ "imAdmin" ] # Multi-platform login policy # For each platform(Android, iOS, Windows, Mac, web), only one can be online at a time @@ -295,9 +303,18 @@ config: enable: false timeout: 5 failedContinue: true + beforeUpdateUserInfoEx: + enable: false + timeout: 5 + failedContinue: true + afterUpdateUserInfoEx: + enable: false + timeout: 5 + failedContinue: true afterSendSingleMsg: enable: false timeout: 5 + failedContinue: true beforeSendGroupMsg: enable: false timeout: 5 @@ -305,6 +322,7 @@ config: afterSendGroupMsg: enable: false timeout: 5 + failedContinue: true msgModify: enable: false timeout: 5 @@ -312,12 +330,15 @@ config: userOnline: enable: false timeout: 5 + failedContinue: true userOffline: enable: false timeout: 5 + failedContinue: true userKickOff: enable: false timeout: 5 + failedContinue: true offlinePush: enable: false timeout: 5 @@ -334,10 +355,18 @@ config: enable: false timeout: 5 failedContinue: true + beforeUpdateUserInfo: + enable: false + timeout: 5 + failedContinue: true beforeCreateGroup: enable: false timeout: 5 failedContinue: true + afterCreateGroup: + enable: false + timeout: 5 + failedContinue: true beforeMemberJoinGroup: enable: false timeout: 5 @@ -346,17 +375,129 @@ config: enable: false timeout: 5 failedContinue: true + afterSetGroupMemberInfo: + enable: false + timeout: 5 + failedContinue: true setMessageReactionExtensions: enable: false timeout: 5 failedContinue: true + quitGroup: + enable: false + timeout: 5 + failedContinue: true + killGroupMember: + enable: false + timeout: 5 + failedContinue: true + dismissGroup: + enable: false + timeout: 5 + failedContinue: true + joinGroup: + enable: false + timeout: 5 + failedContinue: true + groupMsgRead: + enable: false + timeout: 5 + failedContinue: true + singleMsgRead: + enable: false + timeout: 5 + failedContinue: true + updateUserInfo: + enable: false + timeout: 5 + failedContinue: true + beforeUserRegister: + enable: false + timeout: 5 + failedContinue: true + afterUserRegister: + enable: false + timeout: 5 + failedContinue: true + transferGroupOwner: + enable: false + timeout: 5 + failedContinue: true + beforeSetFriendRemark: + enable: false + timeout: 5 + failedContinue: true + afterSetFriendRemark: + enable: false + timeout: 5 + failedContinue: true + afterGroupMsgRead: + enable: false + timeout: 5 + failedContinue: true + afterGroupMsgRevoke: + enable: false + timeout: 5 + failedContinue: true + afterJoinGroup: + enable: false + timeout: 5 + failedContinue: true + beforeInviteUserToGroup: + enable: false + timeout: 5 + failedContinue: true + joinGroupAfter: + enable: false + timeout: 5 + failedContinue: true + setGroupInfoAfter: + enable: false + timeout: 5 + failedContinue: true + setGroupInfoBefore: + enable: false + timeout: 5 + failedContinue: true + revokeMsgAfter: + enable: false + timeout: 5 + failedContinue: true + addBlackBefore: + enable: false + timeout: 5 + failedContinue: true + addFriendAfter: + enable: false + timeout: 5 + failedContinue: true + addFriendAgreeBefore: + enable: false + timeout: 5 + failedContinue: true + deleteFriendAfter: + enable: false + timeout: 5 + failedContinue: true + importFriendsBefore: + enable: false + timeout: 5 + failedContinue: true + importFriendsAfter: + enable: false + timeout: 5 + failedContinue: true + removeBlackAfter: + enable: false + timeout: 5 + failedContinue: true ###################### Prometheus ###################### # Prometheus configuration for various services # The number of Prometheus ports per service needs to correspond to rpcPort # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh prometheus: - enable: false + enable: true grafanaUrl: "https://openim2.server.top/" apiPrometheusPort: [ 90 ] userPrometheusPort: [ 90 ] diff --git a/docs/user-guide-zh.md b/docs/contrib/user-guide-zh.md similarity index 83% rename from docs/user-guide-zh.md rename to docs/contrib/user-guide-zh.md index 4daddc3..a4aa474 100644 --- a/docs/user-guide-zh.md +++ b/docs/contrib/user-guide-zh.md @@ -8,27 +8,27 @@ + openim管理后台网页地址:https://yourdomain/openim-admin-front/ + 管理后台默认用户名和密码 (admin1:admin1). + 点击下图链接，将打开grafana网页. - ![img.png](img.png) + ![../images/img.png](../images/img.png) ## 怎么使用grafana查看监控指标 1. 登入grafana使用默认用户名和密码(admin:prom-operator) 2. 默认情况下Prometheus的数据源已经配置好的, 你只需要导入自定义的openim的dashboard仪表盘就你查看openimserver的自定义指标. + 点击下图的import按钮 - ![img_1.png](img_1.png) + ![../images/$&) +拷贝 k8s-custom.yaml 到下图区域,接着点击load按钮 - ![img_2.png](img_2.png) + ![../images/$&) + 选择你的 k8s namespace ,截止你将要查看到自定义指标信息 - ![img_3.png](img_3.png) + ![../images/$&) 3. 使用 Node exposer dashboard仪表盘查看物理节点信息 - ![img_4.png](img_4.png) - ![img_5.png](img_5.png) + ![../images/$&) + ![../images/$&) ## 使用grafana查看loki收集的日志 1. 增加loki数据源 - ![img_6.png](img_6.png) + ![../images/$&) + 设置loki datasource url= http://loki-stack:3100 ,and click save&test button - ![img_7.png](img_7.png) + ![../images/$&) 2. 使用 k8s-loki.yaml导入日志仪表盘 - ![img_8.png](img_8.png) + ![../images/$&) + 接着你将要看到 openimserver的日志 - ![img_9.png](img_9.png) \ No newline at end of file + ![../images/$&) \ No newline at end of file diff --git a/docs/user-guide.md b/docs/contrib/user-guide.md similarity index 83% rename from docs/user-guide.md rename to docs/contrib/user-guide.md index 40ab342..86cc97b 100644 --- a/docs/user-guide.md +++ b/docs/contrib/user-guide.md @@ -8,31 +8,27 @@ + open adminfront website by:https://yourdomain/openim-admin-front/ + Log in using the default username and password (admin1:admin1). + check the follow link,then will open grafana website. - ![img.png](img.png) + ![../images/img.png](../images/img.png) ## How to use grafana view metrics 1. log in grafana using the default username and password(admin:prom-operator) 2. The default Prometheus data source is already configured, so in the second step, you only need to import the openim custom dashboard to view the openim custom metrics. + click the import button in follow picture - ![img_1.png](img_1.png) + ![../images/$&) + copy k8s-custom.yaml content to follow section,and click load button - ![img_2.png](img_2.png) + ![../images/$&) + select your k8s namespace ,and then you will view the openim custom metrics - ![img_3.png](img_3.png) + ![../images/$&) 3. view node metrics by the default Node exposer dashboard - ![img_4.png](img_4.png) - ![img_5.png](img_5.png) + ![../images/$&) + ![../images/$&) ## How to use grafana view logs 1. add loki datasource - ![img_6.png](img_6.png) + ![../images/$&) + set loki datasource url= http://loki-stack:3100 ,and click save&test button - ![img_7.png](img_7.png) + ![../images/$&) 2. import log view dashboard using k8s-loki.yaml - ![img_8.png](img_8.png) + ![../images/$&) + then you will view the logs of openimserver - ![img_9.png](img_9.png) - - - - + ![../images/$&) diff --git a/docs/contrib/version-zh.md b/docs/contrib/version-zh.md new file mode 100644 index 0000000..2ec5d91 --- /dev/null +++ b/docs/contrib/version-zh.md @@ -0,0 +1,78 @@ +# OpenIM Helm 图表的高级版本管理 + +OpenIM Helm 图表采用了一套复杂的版本管理系统，涵盖了多种图表，如 `openim-server`、`openim-chat`、`openim-web` 和 `openim-admin`。这一系统虽然复杂，但确保了图表部署和维护的流畅和高效。 + +## 版本控制的独特方法 + +不同于传统软件版本控制常依赖的分支概念，OpenIM 的 Helm 图表使用基于标签的系统。这种方法简化了版本管理流程，如下： + +- **Chart.yaml 文件**：每个图表目录中都包含一个 `Chart.yaml` 文件，这个文件对于管理每个单独图表的版本至关重要。它包含了 `version` 键，每个新版本发布时都会更新此键。 + +```yaml +version: 0.1.17 +``` + +- **自动化 CICD**：开发者不需要手动管理分支、标签或发布。这些方面都通过连续集成和连续部署（CICD）系统自动处理。当一个新的图表版本推送到仓库时，就会触发 CICD 流水线。 + +- **标签和发布**：CICD 系统自动构建新版本并将其发布到 Helm 仓库。它还会标记发布，例如，`openim-admin-0.1.2`。标签结构被精心设计，以便于导航和版本跟踪。 + +> 标签命名规范：**v1.0.0-k8s** 对比 **k8s-v1.0.0** + +1. **v1.0.0-k8s**：此格式遵循传统的版本系统（主要.次要.补丁）并添加了一个分支特定的标识符，便于通过版本号识别和排序。 + +2. **k8s-v1.0.0**：这里，分支标识符位于版本号之前。这对于拥有多个分支的仓库特别有用，因为它允许快速区分分支特定的构建。 + +**统一策略**： + +- 对于需要多种版本策略的单分支仓库，如 helm-charts，**k8s-v1.0.0** 更为方便和可辨识。 +- 对于多分支场景，如 `openim-web` 和 `openim-admin`，需要本地标签，**v1.0.0-k8s** 更适合。它有助于更好的版本控制，并在管理相关的镜像和发布时提供帮助。 + +## 发布流程和安装 + +标签完成后，CICD 自动化处理发布流程。例如，可以本地下载和提取如 `https://github.com/openimsdk/helm-charts/releases/tag/openim-admin-0.1.2` 的发布： + +```bash +tar -zxvf openim-admin-0.1.2.tgz +``` + +细节： + +```bash +openim-admin# tree +. +├── Chart.yaml +├── README.md.gotmpl +├── templates +│ ├── deployment.yaml +│ ├── _helpers.tpl +│ ├── hpa.yaml +│ ├── ingress.yaml +│ ├── NOTES.txt +│ ├── serviceaccount.yaml +│ ├── service.yaml +│ └── tests +│ └── test-connection.yaml +└── values.yaml +``` + +这种提取揭示了一个可以使用 Helm 部署的结构化目录： + +```bash +helm install openim-admin ./openim-admin +``` + +## 网络接口和仓库集成 + +CICD 还自动化部署了网络接口，如 `https://openimsdk.github.io/helm-charts/`。用户可以使用以下命令添加 OpenIM Helm 仓库： + +```bash +helm repo add openim https://openimsdk.github.io/helm-charts/ +``` + +然后搜索可用的 + + OpenIM 图表： + +```bash +helm search repo openim +``` \ No newline at end of file diff --git a/docs/version.md b/docs/contrib/version.md similarity index 99% rename from docs/version.md rename to docs/contrib/version.md index 7123f26..a82b118 100644 --- a/docs/version.md +++ b/docs/contrib/version.md @@ -9,7 +9,7 @@ Unlike traditional software version control that often relies on branch concepts - **Chart.yaml File**: Each chart contains a `Chart.yaml` file in its directory. This file is pivotal for managing the version of each individual chart. It holds the `version` key, which gets updated with every new release. ```yaml -version: 0.1.16 +version: 0.1.17 ``` - **Automated CICD**: Developers don't need to worry about managing branches, tags, or releases manually. These aspects are handled automatically through Continuous Integration and Continuous Deployment (CICD) systems. When a new chart version is pushed to the repository, the CICD pipeline is triggered. diff --git a/docs/img.png b/docs/images/img.png similarity index 100% rename from docs/img.png rename to docs/images/img.png diff --git a/docs/img_1.png b/docs/images/img_1.png similarity index 100% rename from docs/img_1.png rename to docs/images/img_1.png diff --git a/docs/img_2.png b/docs/images/img_2.png similarity index 100% rename from docs/img_2.png rename to docs/images/img_2.png diff --git a/docs/img_3.png b/docs/images/img_3.png similarity index 100% rename from docs/img_3.png rename to docs/images/img_3.png diff --git a/docs/img_4.png b/docs/images/img_4.png similarity index 100% rename from docs/img_4.png rename to docs/images/img_4.png diff --git a/docs/img_5.png b/docs/images/img_5.png similarity index 100% rename from docs/img_5.png rename to docs/images/img_5.png diff --git a/docs/img_6.png b/docs/images/img_6.png similarity index 100% rename from docs/img_6.png rename to docs/images/img_6.png diff --git a/docs/img_7.png b/docs/images/img_7.png similarity index 100% rename from docs/img_7.png rename to docs/images/img_7.png diff --git a/docs/img_8.png b/docs/images/img_8.png similarity index 100% rename from docs/img_8.png rename to docs/images/img_8.png diff --git a/docs/img_9.png b/docs/images/img_9.png similarity index 100% rename from docs/img_9.png rename to docs/images/img_9.png diff --git a/infra/mongodb-config.yaml b/infra/mongodb-config.yaml index 8f20fc8..db1890c 100644 --- a/infra/mongodb-config.yaml +++ b/infra/mongodb-config.yaml @@ -10,9 +10,9 @@ auth: enabled: true rootUser: root rootPassword: "openIM123" - usernames: [openim] + usernames: [openIM] passwords: [openIM123] - databases: [openIM_v3] + databases: [openim_v3] persistence: size: 1Gi diff --git a/infra/mongodb/values.yaml b/infra/mongodb/values.yaml index 92ec88f..458a7e7 100644 --- a/infra/mongodb/values.yaml +++ b/infra/mongodb/values.yaml @@ -168,9 +168,9 @@ auth: ## @param auth.passwords List of passwords for the custom users set at `auth.usernames` ## @param auth.databases List of custom databases to be created during the initialization ## - usernames: [openim] + usernames: [openIM] passwords: [openIM123] - databases: [openIM_v3] + databases: [openim_v3] ## @param auth.username DEPRECATED: use `auth.usernames` instead ## @param auth.password DEPRECATED: use `auth.passwords` instead ## @param auth.database DEPRECATED: use `auth.databases` instead diff --git a/k8s-chat-server-config.yaml b/k8s-chat-server-config.yaml index 3b1bf6f..bebd5b6 100644 --- a/k8s-chat-server-config.yaml +++ b/k8s-chat-server-config.yaml @@ -5,7 +5,7 @@ image: # registry.cn-hangzhou.aliyuncs.com/openimsdk/admin-api repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/chat-api-admin pullPolicy: Always - tag: "release-v1.5" + tag: "release-v1.6" ingress: enabled: true className: "nginx" @@ -26,7 +26,7 @@ chat-api: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/chat-api-chat pullPolicy: Always - tag: "release-v1.5" + tag: "release-v1.6" ingress: enabled: true className: "nginx" @@ -47,10 +47,10 @@ admin-rpc: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/chat-rpc-admin pullPolicy: Always - tag: "release-v1.5" + tag: "release-v1.6" chat-rpc: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/chat-rpc-chat pullPolicy: Always - tag: "release-v1.5" + tag: "release-v1.6" diff --git a/k8s-open-im-server-config.yaml b/k8s-open-im-server-config.yaml index e4e42ea..0cc3c46 100644 --- a/k8s-open-im-server-config.yaml +++ b/k8s-open-im-server-config.yaml @@ -9,7 +9,7 @@ global: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-api pullPolicy: Always - tag: "release-v3.5" + tag: "release-v3.6" ingress: enabled: true className: "nginx" @@ -50,51 +50,51 @@ openim-msggateway-proxy: openim-msggateway: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-msggateway - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always # openim-msgtransfer in openim/openim-server/values.yaml not defined, Pass to openim/openim-server/openim-msgtransfer/values.yaml openim-msgtransfer: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-msgtransfer - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-push: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-push - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-auth: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-auth - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-conversation: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-conversation - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-friend: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-friend - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-group: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-group - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-msg: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-msg - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-third: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-third - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always openim-rpc-user: image: repository: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-user - tag: "release-v3.5" + tag: "release-v3.6" pullPolicy: Always