From 1c294bf1afaa4d1c2ca3d8ba63a50dc9fcd71882 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 12 Jun 2025 13:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=B1=82=E6=98=A0=E5=B0=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- microservices/auth.yaml | 2 +- microservices/cms.yaml | 2 +- microservices/dms.yaml | 4 ++-- microservices/dss.yaml | 4 ++-- microservices/file.yaml | 9 ++++++++- microservices/gateway.yaml | 2 +- microservices/makerspace.yaml | 4 ++-- microservices/mon.yaml | 2 +- microservices/pms.yaml | 7 ++++--- microservices/system.yaml | 2 +- microservices/wiki.yaml | 2 +- microservices/zone.yaml | 2 +- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/microservices/auth.yaml b/microservices/auth.yaml index eb13214..0bdad87 100644 --- a/microservices/auth.yaml +++ b/microservices/auth.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # auth-service.yaml diff --git a/microservices/cms.yaml b/microservices/cms.yaml index 615c434..a3ea4f7 100644 --- a/microservices/cms.yaml +++ b/microservices/cms.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # cms-service.yaml diff --git a/microservices/dms.yaml b/microservices/dms.yaml index 0062ab2..97711e4 100644 --- a/microservices/dms.yaml +++ b/microservices/dms.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: dms - image: microservices-modules-dms:202504011409 + image: microservices-modules-dms:latest imagePullPolicy: IfNotPresent env: - name: TZ @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # dms-service.yaml diff --git a/microservices/dss.yaml b/microservices/dss.yaml index 21f2457..f27e341 100644 --- a/microservices/dss.yaml +++ b/microservices/dss.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: dss - image: osredm-modules-dss:20250512 + image: microservices-modules-dss:latest imagePullPolicy: IfNotPresent env: - name: TZ @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # dss-service.yaml diff --git a/microservices/file.yaml b/microservices/file.yaml index 9c852cc..59276c3 100644 --- a/microservices/file.yaml +++ b/microservices/file.yaml @@ -31,10 +31,17 @@ spec: volumeMounts: - name: shared-logs-volume mountPath: /home/microservices/logs + volumeMounts: + - name: upload-volume + mountPath: /home/microservices/uploadPath volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs + type: DirectoryOrCreate + - name: upload-volume + hostPath: + path: /data/k8s-data/microservices-ns/uploadPath type: DirectoryOrCreate --- # file-service.yaml diff --git a/microservices/gateway.yaml b/microservices/gateway.yaml index 353e762..5a2a94c 100644 --- a/microservices/gateway.yaml +++ b/microservices/gateway.yaml @@ -48,7 +48,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # gateway-service.yaml diff --git a/microservices/makerspace.yaml b/microservices/makerspace.yaml index d8860c1..29d95fb 100644 --- a/microservices/makerspace.yaml +++ b/microservices/makerspace.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: makerspace - image: osredm-makerspace:1.0.0 + image: microservices-makerspace:latest imagePullPolicy: IfNotPresent env: - name: TZ @@ -35,7 +35,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/makerspace/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # makerspace-service.yaml diff --git a/microservices/mon.yaml b/microservices/mon.yaml index 09b7b93..9a8ca30 100644 --- a/microservices/mon.yaml +++ b/microservices/mon.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # mon-service.yaml diff --git a/microservices/pms.yaml b/microservices/pms.yaml index 47521cb..ab7d042 100644 --- a/microservices/pms.yaml +++ b/microservices/pms.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: pms - image: osredm-modules-pms:20250513 + image: microservices-modules-pms:latest imagePullPolicy: IfNotPresent env: - name: TZ @@ -27,14 +27,15 @@ spec: - containerPort: 8084 resources: limits: - memory: "1024Mi" + cpu: 2 + memory: 1024Mi volumeMounts: - name: shared-logs-volume mountPath: /home/microservices/logs volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # pms-service.yaml diff --git a/microservices/system.yaml b/microservices/system.yaml index e217d11..57909a6 100644 --- a/microservices/system.yaml +++ b/microservices/system.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- diff --git a/microservices/wiki.yaml b/microservices/wiki.yaml index 2c2f0f0..ade0d42 100644 --- a/microservices/wiki.yaml +++ b/microservices/wiki.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # wiki-service.yaml diff --git a/microservices/zone.yaml b/microservices/zone.yaml index 6e014ac..cbedccc 100644 --- a/microservices/zone.yaml +++ b/microservices/zone.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: shared-logs-volume hostPath: - path: /data/k8s-data/microservices/ + path: /data/k8s-data/microservices-ns/logs type: DirectoryOrCreate --- # zone-service.yaml