msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

Browse Source
pull/354/head
Gordon 3 years ago
parent 9dc798bc53 c6ea841064
commit a64e5a776a
20 changed files with 120 additions and 152 deletions
Show Stats Download Patch File Download Diff File

17
deploy_k8s/admin_cms/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: admin-cms
image: openim/admin_cms:v2.3.4
image: openim/admin_cms:v2.3.8
# imagePullPolicy: Always #每次启动都重新拉取镜像
ports:
- containerPort: 10200
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,11 +30,13 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/api/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: api
image: openim/api:v2.3.4
image: openim/api:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10002
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,11 +30,12 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: openim-config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新
---

16
deploy_k8s/auth/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: auth
image: openim/auth:v2.3.4
image: openim/auth:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10160
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

2
deploy_k8s/build_push_all_images.sh
Unescape View File

@ -2,7 +2,7 @@
source ./path_info.cfg
# images version
version=v2.3.4
version=v2.3.8
git pull
cd ../script/; ./build_all_service.sh
cd ../deploy_k8s/

16
deploy_k8s/cache/deployment.yaml vendored
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: cache
image: openim/cache:v2.3.4
image: openim/cache:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10240
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: openim-config
- name: usualconfig
configMap:
name: openim-usualConfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/cms_api/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: cms-api
image: openim/cms_api:v2.3.4
image: openim/cms_api:v2.3.8
imagePullPolicy: Always
ports:
- containerPort: 10006
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,11 +30,12 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新
---

16
deploy_k8s/conversation/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: conversation
image: openim/conversation:v2.3.4
image: openim/conversation:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10230
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -34,11 +31,12 @@ spec:
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/demo/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: demo
image: openim/demo:v2.3.4
image: openim/demo:v2.3.8
imagePullPolicy: Always
ports:
- containerPort: 10004
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,11 +30,12 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新
---

16
deploy_k8s/friend/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: friend
image: openim/friend:v2.3.4
image: openim/friend:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10120
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,11 +30,12 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/group/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: group
image: openim/group:v2.3.4
image: openim/group:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10150
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

9
deploy_k8s/k8s_openim_deploy.md
Unescape View File

@ -9,18 +9,17 @@
6. 将rpcRegisterIP修改为空, 此地址为每个rpc注册到ETCD的地址, 置空每个rpc将会将pod地址注册到ETCD, 才能正确rpc请求(重要)
7. 如果使用minio作为对象存储, 还需要修改minio的地址
8. 其他如果使用离线推送,需要修改push离线推送配置
9. 修改demo中的imAPIURL字段为openIM api的ingress或者service地址, 需要让demo的pod能正确请求到(重要)
10. 其他非必须配置修改, 如短信,推送等
### 2. 项目根目录创建im configMap到k8s openim namespace
1. 为open-IM项目创建单独命名空间
```
kubectl create namespace openim
```
2. 在项目根目录通过config/config.yaml
2. 修改config.yaml后在项目根目录创建configmap, config/usualConfig.yaml只需要挂载不需要修改配置
```
kubectl -n openim create configmap config --from-file=config/config.yaml
kubectl -n openim create configmap usualconfig --from-file=config/usualConfig.yaml
kubectl -n openim create configmap openim-config --from-file=config/config.yaml
kubectl -n openim create configmap openim-usualconfig --from-file=config/usualConfig.yaml
```
查看configmap
```

16
deploy_k8s/msg/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: msg
image: openim/msg:v2.3.4
image: openim/msg:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10130
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualConfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/msg_gateway/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: msg-gateway
image: openim/msg_gateway:v2.3.4
image: openim/msg_gateway:v2.3.8
# imagePullPolicy: Always
ports:
- name: rpc-port
@ -26,9 +26,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -36,11 +33,12 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新
---

16
deploy_k8s/msg_transfer/deployment.yaml
Unescape View File

@ -15,15 +15,12 @@ spec:
spec:
containers:
- name: msg-transfer
image: openim/msg_transfer:v2.3.4
image: openim/msg_transfer:v2.3.8
# imagePullPolicy: Always
volumeMounts:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -31,10 +28,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/office/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: office
image: openim/office:v2.3.4
image: openim/office:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10210
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/organization/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: organization
image: openim/organization:v2.3.4
image: openim/organization:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10220
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

16
deploy_k8s/push/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: push
image: openim/push:v2.3.4
image: openim/push:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10170
@ -23,9 +23,6 @@ spec:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualConfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -33,10 +30,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

2
deploy_k8s/sdk_server/deployment.yaml
Unescape View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: sdk-server
image: openim/sdk_server:v2.3.4
image: openim/sdk_server:v2.3.8
# imagePullPolicy: Always
ports:
- containerPort: 10003

16
deploy_k8s/user/deployment.yaml
Unescape View File

@ -15,15 +15,12 @@ spec:
spec:
containers:
- name: user
image: openim/user:v2.3.4
image: openim/user:v2.3.8
# imagePullPolicy: Always
volumeMounts:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualconfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
@ -31,10 +28,11 @@ spec:
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: config
- name: usualconfig
configMap:
name: usualconfig
projected:
sources:
- configMap:
name: openim-config
- configMap:
name: openim-usualconfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

2
pkg/common/constant/constant.go
Unescape View File

@ -361,4 +361,4 @@ const StatisticsTimeInterval = 60
const MaxNotificationNum = 500
const CurrentVersion = "v2.3.4-rc0"
const CurrentVersion = "v2.3.8-rc0"

Write Preview
Loading…
Cancel
Save