Merge pull request #414 from bcgov/yj

chore: logs
bcgov · Jun 19, 2024 · ddaf338 · ddaf338
2 parents e7e50b2 + df9e450
commit ddaf338
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 64 deletions.
diff --git a/helm/_backend/templates/deployment.yaml b/helm/_backend/templates/deployment.yaml
@@ -101,6 +101,9 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             failureThreshold: 5
+          volumeMounts:
+            - name: logs
+              mountPath: /strdss/logs
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -114,4 +117,12 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: logs
+      {{- if .Values.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ include "app.fullname" . }}-log
+      {{- else }}
+        emptyDir: {}
       {{- end }}
diff --git a/helm/_backend/templates/pvc.yaml b/helm/_backend/templates/pvc.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.persistence.enabled }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ include "app.fullname" . }}-log
+  labels:
+    {{- include "app.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.persistence.pvcSize }}
+{{- end }}
diff --git a/helm/_backend/values.yaml b/helm/_backend/values.yaml
@@ -53,4 +53,8 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}
+
+persistence:
+  enabled: true
+  pvcSize: 256Mi
diff --git a/helm/_hangfire/templates/deployment.yaml b/helm/_hangfire/templates/deployment.yaml
@@ -101,6 +101,9 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             failureThreshold: 5
+          volumeMounts:
+            - name: logs
+              mountPath: /strdss/logs
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -114,4 +117,12 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: logs
+      {{- if .Values.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ include "app.fullname" . }}-log
+      {{- else }}
+        emptyDir: {}
       {{- end }}
diff --git a/helm/_hangfire/templates/pvc.yaml b/helm/_hangfire/templates/pvc.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.persistence.enabled }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ include "app.fullname" . }}-log
+  labels:
+    {{- include "app.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.persistence.pvcSize }}
+{{- end }}
diff --git a/helm/_hangfire/values.yaml b/helm/_hangfire/values.yaml
@@ -53,4 +53,8 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}
+
+persistence:
+  enabled: true
+  pvcSize: 256Mi
diff --git a/server/StrDss.Api/appsettings.Development.json b/server/StrDss.Api/appsettings.Development.json
diff --git a/server/StrDss.Api/appsettings.json b/server/StrDss.Api/appsettings.json
@@ -15,7 +15,7 @@
       {
         "Name": "File",
         "Args": {
-          "path": "logs/app-.log",
+          "path": "/strdss/logs/app-.log",
           "rollingInterval": "Day",
           "fileSizeLimitBytes": 10485760,
           "rollOnFileSizeLimit": true,

diff --git a/server/StrDss.Hangfire/appsettings.Development.json b/server/StrDss.Hangfire/appsettings.Development.json
diff --git a/server/StrDss.Hangfire/appsettings.json b/server/StrDss.Hangfire/appsettings.json
@@ -15,7 +15,7 @@
       {
         "Name": "File",
         "Args": {
-          "path": "logs/hangfire-.log",
+          "path": "/strdss/logs/app-.log",
           "rollingInterval": "Day",
           "fileSizeLimitBytes": 10485760,
           "rollOnFileSizeLimit": true,