From 8f31bd93faf92bdb4b814b66896e2244e55c0424 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 Aug 2022 11:31:45 +0800 Subject: [PATCH 1/2] k8s conf --- deploy_k8s/admin_cms/deployment.yaml | 2 +- deploy_k8s/api/deployment.yaml | 2 +- deploy_k8s/auth/deployment.yaml | 2 +- deploy_k8s/cache/deployment.yaml | 2 +- deploy_k8s/cms_api/deployment.yaml | 2 +- deploy_k8s/conversation/deployment.yaml | 2 +- deploy_k8s/demo/deployment.yaml | 2 +- deploy_k8s/friend/deployment.yaml | 2 +- deploy_k8s/group/deployment.yaml | 2 +- deploy_k8s/message_cms/deployment.yaml | 2 +- deploy_k8s/msg/deployment.yaml | 2 +- deploy_k8s/msg_gateway/deployment.yaml | 2 +- deploy_k8s/msg_transfer/deployment.yaml | 2 +- deploy_k8s/office/deployment.yaml | 2 +- deploy_k8s/organization/deployment.yaml | 2 +- deploy_k8s/push/deployment.yaml | 2 +- deploy_k8s/sdk_server/deployment.yaml | 4 ++-- deploy_k8s/statistics/deployment.yaml | 2 +- deploy_k8s/user/deployment.yaml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 2da7716ff..fe884b2d7 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.2.0 + image: openim/admin_cms:v2.3.0release # imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 9fc6a5111..6e6a41cc5 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.2.0 + image: openim/api:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10002 diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 19863d6c2..9efcc4f6f 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.2.0 + image: openim/auth:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10160 diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index 1f9a2b046..4ec54398b 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.2.0 + image: openim/cache:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10240 diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 4c75bc785..1aa52699b 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.2.0 + image: openim/cms_api:v2.3.0release imagePullPolicy: Always ports: - containerPort: 10006 diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index e5c385e17..6e1d90c5d 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.2.0 + image: openim/conversation:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10230 diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index e4594191e..86147883d 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.2.0 + image: openim/demo:v2.3.0release imagePullPolicy: Always ports: - containerPort: 10004 diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 5a92a95fc..55f17f7f8 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.2.0 + image: openim/friend:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10120 diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 02553d979..0154295ab 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.2.0 + image: openim/group:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10150 diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index d3f6b1c2a..d1aa6cb78 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: message-cms - image: openim/message_cms:v2.2.0 + image: openim/message_cms:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10190 diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 5a33c17af..8971f8e15 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.2.0 + image: openim/msg:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10130 diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 0f6b9c798..0342fa219 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.2.0 + image: openim/msg_gateway:v2.3.0release # imagePullPolicy: Always ports: - name: rpc-port diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index b94d9b277..32bedeb60 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg-transfer - image: openim/msg_transfer:v2.2.0 + image: openim/msg_transfer:v2.3.0release # imagePullPolicy: Always volumeMounts: - name: config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index c6a7bf813..096003d14 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.2.0 + image: openim/office:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10210 diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index b2ec03443..deb61de74 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.2.0 + image: openim/organization:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10220 diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index aaabe9e68..592693362 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.2.0 + image: openim/push:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10170 diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index ff3aa0e44..5ce0ddfa8 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.2.0 + image: openim/sdk_server:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10003 @@ -26,7 +26,7 @@ spec: - name: local-db mountPath: /db/sdk command: ["/Open-IM-Server/main"] - args: ["-openIM_api_port", "10002", "-openIM_ws_port", "10001", "-sdk_ws_port", "10003", "-openIM_log_level", "6"] + args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10001", "-openIM_api_address", "api_address", "-openIM_log_level", "6"] volumes: - name: config configMap: diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index 10c182da7..a83310f27 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: statistics - image: openim/statistics:v2.2.0 + image: openim/statistics:v2.3.0release # imagePullPolicy: Always ports: - containerPort: 10180 diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 4278c78e1..33c1973e3 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: user - image: openim/user:v2.2.0 + image: openim/user:v2.3.0release # imagePullPolicy: Always volumeMounts: - name: config From 5b68d86052988b257540b2ac535cab012567d594 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 Aug 2022 16:30:08 +0800 Subject: [PATCH 2/2] k8s --- deploy_k8s/admin_cms/deployment.yaml | 3 +++ deploy_k8s/api/deployment.yaml | 3 +++ deploy_k8s/auth/deployment.yaml | 3 +++ deploy_k8s/cache/deployment.yaml | 3 +++ deploy_k8s/cms_api/deployment.yaml | 3 +++ deploy_k8s/conversation/deployment.yaml | 4 ++++ deploy_k8s/demo/deployment.yaml | 3 +++ deploy_k8s/friend/deployment.yaml | 3 +++ deploy_k8s/group/deployment.yaml | 3 +++ deploy_k8s/message_cms/deployment.yaml | 3 +++ deploy_k8s/msg/deployment.yaml | 3 +++ deploy_k8s/msg_gateway/deployment.yaml | 3 +++ deploy_k8s/msg_transfer/deployment.yaml | 3 +++ deploy_k8s/office/deployment.yaml | 3 +++ deploy_k8s/organization/deployment.yaml | 3 +++ deploy_k8s/push/deployment.yaml | 3 +++ deploy_k8s/sdk_server/deployment.yaml | 3 +++ deploy_k8s/statistics/deployment.yaml | 3 +++ deploy_k8s/user/deployment.yaml | 3 +++ 19 files changed, 58 insertions(+) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index fe884b2d7..369cee350 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 6e6a41cc5..e99cf0e76 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 9efcc4f6f..0285ef815 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index 4ec54398b..b8b3d6244 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 1aa52699b..e3da1cb62 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 6e1d90c5d..885d92c4b 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -23,6 +23,10 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" + volumes: - name: config configMap: diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 86147883d..a23abb0b2 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 55f17f7f8..b57d19f73 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 0154295ab..99837b758 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index d1aa6cb78..131342ecf 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 8971f8e15..e95eb6279 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 0342fa219..fc3ff94d5 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -26,6 +26,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 32bedeb60..36af35219 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -21,6 +21,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 096003d14..2dd1c1ec1 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index deb61de74..67f21ffca 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 592693362..0b8603bf0 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 5ce0ddfa8..f10782220 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -25,6 +25,9 @@ spec: readOnly: true - name: local-db mountPath: /db/sdk + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" command: ["/Open-IM-Server/main"] args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10001", "-openIM_api_address", "api_address", "-openIM_log_level", "6"] volumes: diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index a83310f27..5fe485ee4 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -23,6 +23,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 33c1973e3..498a6301d 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -21,6 +21,9 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true + env: + - name: CONFIG_NAME + value: "/Open-IM-Server" volumes: - name: config configMap: