From 6f2035c942fff3a3974c15c1d5de47f259d9b001 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 17:45:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 8 +++++++- docker/modules/websocket/deploy/deploy.yaml | 8 +++++++- docker/qiuguo/gateway/deploy/deploy.yaml | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index 4880760..ce13977 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -38,9 +38,15 @@ spec: - containerPort: 8080 protocol: TCP resources: + requests: #资源请求的设置 + cpu: 0m #Cpu请求，容器启动的初始可用数量 + memory: 600Mi #内存清楚，容器启动的初始可用数量 limits: - cpu: 100m + cpu: 80m memory: 600Mi + volumeMounts: + - mountPath: /nfs/data/qiuguo/iot/logs + name: /home/qiuguo terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index 1f67ca3..dc94786 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -38,9 +38,15 @@ spec: - containerPort: 8080 protocol: TCP resources: + requests: #资源请求的设置 + cpu: 0m #Cpu请求，容器启动的初始可用数量 + memory: 600Mi #内存清楚，容器启动的初始可用数量 limits: - cpu: 100m + cpu: 80m memory: 600Mi + volumeMounts: + - mountPath: /nfs/data/qiuguo/iot/logs + name: /home/qiuguo terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 38ab19d..214c10d 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -38,9 +38,15 @@ spec: - containerPort: 8080 protocol: TCP resources: + requests: #资源请求的设置 + cpu: 0m #Cpu请求，容器启动的初始可用数量 + memory: 600Mi #内存清楚，容器启动的初始可用数量 limits: - cpu: 100m + cpu: 80m memory: 600Mi + volumeMounts: + - mountPath: /nfs/data/qiuguo/iot/logs + name: /home/qiuguo terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst From 14ebe7d7015ac21ef36c741d5d0f49d254181b8e Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 17:50:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 4 ++-- docker/modules/websocket/deploy/deploy.yaml | 4 ++-- docker/qiuguo/gateway/deploy/deploy.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index ce13977..34f8753 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -45,8 +45,8 @@ spec: cpu: 80m memory: 600Mi volumeMounts: - - mountPath: /nfs/data/qiuguo/iot/logs - name: /home/qiuguo + - mountPath: /home/qiuguo/logs + name: iot-logs terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index dc94786..ce0e28b 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -45,8 +45,8 @@ spec: cpu: 80m memory: 600Mi volumeMounts: - - mountPath: /nfs/data/qiuguo/iot/logs - name: /home/qiuguo + - mountPath: /home/qiuguo/logs + name: iot-logs terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 214c10d..2f05818 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -45,8 +45,8 @@ spec: cpu: 80m memory: 600Mi volumeMounts: - - mountPath: /nfs/data/qiuguo/iot/logs - name: /home/qiuguo + - mountPath: /home/qiuguo/logs + name: iot-logs terminationMessagePath: /nfs/data/qiuguo/iot/logs terminationMessagePolicy: File dnsPolicy: ClusterFirst From 90da766069dc007448512c6160e88c9a47185b15 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 18:01:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 4 ++++ docker/modules/websocket/deploy/deploy.yaml | 4 ++++ docker/qiuguo/gateway/deploy/deploy.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index 34f8753..5c0f200 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -52,6 +52,10 @@ spec: dnsPolicy: ClusterFirst restartPolicy: Always terminationGracePeriodSeconds: 30 + volumes: + - name: iot-logs + hostPath: + path: /nfs/data/qiuguo/iot/logs --- apiVersion: v1 kind: Service diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index ce0e28b..dddc506 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -52,6 +52,10 @@ spec: dnsPolicy: ClusterFirst restartPolicy: Always terminationGracePeriodSeconds: 30 + volumes: + - name: iot-logs + hostPath: + path: /nfs/data/qiuguo/iot/logs --- apiVersion: v1 kind: Service diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 2f05818..2c906cc 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -52,6 +52,10 @@ spec: dnsPolicy: ClusterFirst restartPolicy: Always terminationGracePeriodSeconds: 30 + volumes: + - name: iot-logs + hostPath: + path: /nfs/data/qiuguo/iot/logs --- apiVersion: v1 kind: Service From a87c1dd7d8a4fe34ee86b5e232b603ab77da47f2 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 18:37:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/dockerfile_test | 16 ---------------- docker/modules/websocket/dockerfile_test | 16 ---------------- docker/qiuguo/gateway/dockerfile_test | 16 ---------------- 3 files changed, 48 deletions(-) delete mode 100644 docker/modules/user/dockerfile_test delete mode 100644 docker/modules/websocket/dockerfile_test delete mode 100644 docker/qiuguo/gateway/dockerfile_test diff --git a/docker/modules/user/dockerfile_test b/docker/modules/user/dockerfile_test deleted file mode 100644 index d0a4e3e..0000000 --- a/docker/modules/user/dockerfile_test +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER qiuguo - -# 挂载目录 -VOLUME /home/qiuguo -# 创建目录 -RUN mkdir -p /home/qiuguo -# 指定路径 -WORKDIR /home/qiuguo -# 复制jar文件到路径 -COPY ./jar/iot-box-user-api.jar /home/qiuguo/iot-box-user-api.jar -# 启动网关服务 -#ENTRYPOINT ["java","-jar","iot-box-user-api.jar"] -CMD ["sh","-c", "java -jar iot-box-user-api.jar --spring.profiles.active=test"] diff --git a/docker/modules/websocket/dockerfile_test b/docker/modules/websocket/dockerfile_test deleted file mode 100644 index 083e5ef..0000000 --- a/docker/modules/websocket/dockerfile_test +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER qiuguo - -# 挂载目录 -VOLUME /home/qiuguo -# 创建目录 -RUN mkdir -p /home/qiuguo -# 指定路径 -WORKDIR /home/qiuguo -# 复制jar文件到路径 -COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar -# 启动网关服务 -#ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"] diff --git a/docker/qiuguo/gateway/dockerfile_test b/docker/qiuguo/gateway/dockerfile_test deleted file mode 100644 index 516cdd3..0000000 --- a/docker/qiuguo/gateway/dockerfile_test +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER qiuguo - -# 挂载目录 -VOLUME /home/qiuguo -# 创建目录 -RUN mkdir -p /home/qiuguo -# 指定路径 -WORKDIR /home/qiuguo -# 复制jar文件到路径 -COPY ./jar/iot-gateway.jar /home/qiuguo/iot-gateway.jar -# 启动网关服务 -#ENTRYPOINT ["java","-jar","iot-gateway.jar"] -CMD ["sh","-c", "java -jar iot-gateway.jar --spring.profiles.active=test"] From 25a11bfa36849c515d84ec2be60e834024598224 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 18:46:01 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 2 +- docker/modules/websocket/deploy/deploy.yaml | 2 +- docker/qiuguo/gateway/deploy/deploy.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index 5c0f200..35377a1 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v1.0.0 + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v$BUILD_NUMBER readinessProbe: httpGet: path: /actuator/health diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index dddc506..5a01d14 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v1.0.0 + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v$BUILD_NUMBER readinessProbe: httpGet: path: /actuator/health diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 2c906cc..8e647de 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v1.0.0 + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v$BUILD_NUMBER readinessProbe: httpGet: path: /actuator/health From aaf99b029626ca2d981a32522bf4783dce16a3fa Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 19:55:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-user-api/src/main/resources/bootstrap-prod.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml index d68207d..6d97184 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml @@ -3,17 +3,10 @@ spring: nacos: discovery: # 服务注册地址 -<<<<<<< HEAD - server-addr: 8.139.5.211:30731 - config: - # 配置中心地址 - server-addr: 8.139.5.211:30731 -======= server-addr: qiuguo-nacos.qiuguo-cloud:8848 config: # 配置中心地址 server-addr: qiuguo-nacos.qiuguo-cloud:8848 ->>>>>>> 64da585a2f5a786febdbeaafd130d2fd086ee8e1 # 配置文件格式 file-extension: yml # 共享配置 From 6a854f25c6fee1e0435927168ccbf1afde9e6476 Mon Sep 17 00:00:00 2001 From: "W.Y" <343887809@qq.com> Date: Tue, 24 Oct 2023 10:34:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[k8s]=20=E5=8F=96=E6=B6=88CPU/=E5=86=85?= =?UTF-8?q?=E5=AD=98=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/qiuguo/gateway/deploy/deploy.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 8e647de..905713e 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -37,13 +37,6 @@ spec: ports: - containerPort: 8080 protocol: TCP - resources: - requests: #资源请求的设置 - cpu: 0m #Cpu请求，容器启动的初始可用数量 - memory: 600Mi #内存清楚，容器启动的初始可用数量 - limits: - cpu: 80m - memory: 600Mi volumeMounts: - mountPath: /home/qiuguo/logs name: iot-logs