Add PVC to smartmet-server templates

fmidev · Oct 30, 2024 · b7a552b · b7a552b
1 parent 8f8e1b4
commit b7a552b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/charts/smartmet-server/Chart.yaml b/charts/smartmet-server/Chart.yaml
@@ -2,17 +2,17 @@ apiVersion: v2
 description: Helm chart for smartmet server
 home: "file"
 keywords:
-- fmi
-- smartmet
+  - fmi
+  - smartmet
 # dependencies:
 # - name: redis
 #   repository: https://charts.bitnami.com/bitnami
 #   version: 18.19.2
 #   condition: redis.enabled
 maintainers:
-- email: [email protected]
-  name: fmi-build-bot
-  url: https://github.com/fmi-build-bot
+  - email: [email protected]
+    name: fmi-build-bot
+    url: https://github.com/fmi-build-bot
 name: smartmet-server
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/smartmet-server/templates/deployment.yaml b/charts/smartmet-server/templates/deployment.yaml
@@ -158,7 +158,16 @@ spec:
           - name: smartmet-engine-geonames-config
             mountPath: /config/engines/geonames.conf
             subPath: geonames.conf
+          {{- if and .Values.pvc.name .Values.pvc.mountPath }}
+          - name: {{ .Values.pvc.name }}
+            mountPath: {{ .Values.pvc.mountPath }}
+          {{- end }}
       volumes:
+      {{- if and .Values.pvc.name .Values.pvc.claimName }}
+      - name: {{ .Values.pvc.name }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.pvc.claimName }}
+      {{- end }}
       - name: smartmet-main-configuration
         configMap:
           name: smartmet-config

diff --git a/charts/smartmet-server/templates/filesys2smartmet/filesys2smartmet-deployment.yaml b/charts/smartmet-server/templates/filesys2smartmet/filesys2smartmet-deployment.yaml
@@ -70,7 +70,17 @@ spec:
             - name: filesys2smartmet-producerdef-config
               mountPath: "/config/libraries/grid-tools/producerDef.csv"
               subPath: "producerDef.csv"
+          {{- if and .Values.pvc.name .Values.pvc.mountPath }}
+            - name: {{ .Values.pvc.name }}
+              mountPath: {{ .Values.pvc.mountPath }}
+          {{- end }}
+
       volumes:
+      {{- if and .Values.pvc.name .Values.pvc.claimName }}
+        - name: {{ .Values.pvc.name }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.pvc.claimName }}
+      {{- end }}
         - name: filesys2smartmet-config
           configMap:
             name: filesys2smartmet-config

diff --git a/charts/smartmet-server/values.yaml b/charts/smartmet-server/values.yaml
@@ -1,4 +1,11 @@
 # Default values
+# This applies both image and filesys2smartmet
+pvc:
+  name: "foo"
+  mountPath: "/foo"
+  claimName: "bar"
+
+# TODO image should probably be renamed to smartmet-server?
 image:
   repository: quay.io/fmi/smartmet-server
   pullPolicy: IfNotPresent
@@ -200,6 +207,7 @@ filesys2smartmet:
     repository: quay.io/fmi/smartmet-server
     pullPolicy: IfNotPresent
     tag: filesys2smartmet-0.1.0
+
   config:
     loopInterval: 60
     memoryMapper: