diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index cfee86a69..07402457d 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -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 # 滚动更新 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index e2c1a451b..0d8f4c03d 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -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 # 滚动更新 --- diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 733c52306..fb3fe4659 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index f2a6b1b49..33ce6e94a 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -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/ diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index c17749e10..df30f8809 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 2af5d3377..ab014a7a2 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -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 # 滚动更新 --- diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 993761195..733617f00 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -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 # 滚动更新 diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index a7f5550a1..11a55b0db 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -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 # 滚动更新 --- diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index dde9cbd4c..9c435f446 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -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 # 滚动更新 diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 96c3fe848..060b8f347 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 4dad2c077..3faf58703 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/deploy_k8s/k8s_openim_deploy.md @@ -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 ``` diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 5538203f6..5e5fe4157 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 18ad66ca3..068a405cf 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -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 # 滚动更新 --- diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index f47583b05..47d04b9d7 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -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 # 滚动更新 diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 4e819971b..759643fe3 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 0b60fb4c2..380628b36 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 1382e5a12..f6ec07500 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -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 # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index bee3dc4bf..6022c2077 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -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 diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index c0c2d53bf..5ad75a922 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -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 # 滚动更新 diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 9a24b694e..9bcef92bf 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -361,4 +361,4 @@ const StatisticsTimeInterval = 60 const MaxNotificationNum = 500 -const CurrentVersion = "v2.3.4-rc0" +const CurrentVersion = "v2.3.8-rc0"