From 2db194b9d10c437d396b3d0b717777dad64b0ef2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 10 Jul 2022 13:03:46 +0800 Subject: [PATCH] k8s --- deploy_k8s/admin_cms/deployment.yaml | 2 +- deploy_k8s/api/deployment.yaml | 2 +- deploy_k8s/auth/deployment.yaml | 2 +- deploy_k8s/build_push_all_images.sh | 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/ingress.yaml | 18 ++++++++++++++++++ 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 | 2 +- deploy_k8s/statistics/deployment.yaml | 2 +- deploy_k8s/user/deployment.yaml | 2 +- 21 files changed, 38 insertions(+), 20 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 727a08520..2da7716ff 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.1.0 + image: openim/admin_cms:v2.2.0 # imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 1a74ae7a1..9fc6a5111 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.1.0 + image: openim/api:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10002 diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 5b60d77f7..19863d6c2 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.1.0 + image: openim/auth:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10160 diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index 6f46bf33c..31d6039a2 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.1.0 +version=v2.2.0 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 ef41d2bde..1f9a2b046 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.1.0 + image: openim/cache:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10240 diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 6f3fd5b2d..4c75bc785 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.1.0 + image: openim/cms_api:v2.2.0 imagePullPolicy: Always ports: - containerPort: 10006 diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 90b6bdab1..e5c385e17 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.1.0 + image: openim/conversation:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10230 diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 8c612d153..e4594191e 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.1.0 + image: openim/demo:v2.2.0 imagePullPolicy: Always ports: - containerPort: 10004 diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index c521c7a3e..5a92a95fc 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.1.0 + image: openim/friend:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10120 diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index a27dc2547..02553d979 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.1.0 + image: openim/group:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10150 diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 6d7fbda6d..88212c2a2 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -48,6 +48,12 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" + nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*' + nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination + nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS' + nginx.ingress.kubernetes.io/cors-allow-origin: '*' + nginx.ingress.kubernetes.io/enable-cors: 'true' + nginx.ingress.kubernetes.io/service-weight: '' name: api-ingress spec: rules: @@ -67,6 +73,12 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" + nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*' + nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination + nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS' + nginx.ingress.kubernetes.io/cors-allow-origin: '*' + nginx.ingress.kubernetes.io/enable-cors: 'true' + nginx.ingress.kubernetes.io/service-weight: '' name: demo-ingress spec: rules: @@ -86,6 +98,12 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" + nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*' + nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination + nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS' + nginx.ingress.kubernetes.io/cors-allow-origin: '*' + nginx.ingress.kubernetes.io/enable-cors: 'true' + nginx.ingress.kubernetes.io/service-weight: '' name: cms-api-ingress spec: rules: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 8c5e3e83d..d3f6b1c2a 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.1.0 + image: openim/message_cms:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10190 diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 4e6873699..5a33c17af 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.1.0 + image: openim/msg:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10130 diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 604af28dd..0f6b9c798 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.1.0 + image: openim/msg_gateway:v2.2.0 # imagePullPolicy: Always ports: - name: rpc-port diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 459a93410..b94d9b277 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.1.0 + image: openim/msg_transfer:v2.2.0 # imagePullPolicy: Always volumeMounts: - name: config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index c7a6c1da5..c6a7bf813 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.1.0 + image: openim/office:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10210 diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index fce6fde5a..b2ec03443 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.1.0 + image: openim/organization:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10220 diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 14ba13fdd..aaabe9e68 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.1.0 + image: openim/push:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10170 diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index f99e67006..ff3aa0e44 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.1.0 + image: openim/sdk_server:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10003 diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index d7cc5e15b..10c182da7 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.1.0 + image: openim/statistics:v2.2.0 # imagePullPolicy: Always ports: - containerPort: 10180 diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 6473094f0..4278c78e1 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.1.0 + image: openim/user:v2.2.0 # imagePullPolicy: Always volumeMounts: - name: config