From 91fb5f3fe2550c89a5e5a4f495550b3e8ec40f1c Mon Sep 17 00:00:00 2001
From: Jeanette Clark <jclark@nceas.ucsb.edu>
Date: Wed, 25 Sep 2024 10:26:47 -0700
Subject: [PATCH] add metacat volume mount

---
 helm/metadig-worker/templates/deployment.yaml | 13 +++--
 helm/metadig-worker/values.yaml               | 51 +++++++++----------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/helm/metadig-worker/templates/deployment.yaml b/helm/metadig-worker/templates/deployment.yaml
index 1b1b8376..68b2707a 100644
--- a/helm/metadig-worker/templates/deployment.yaml
+++ b/helm/metadig-worker/templates/deployment.yaml
@@ -40,18 +40,20 @@ spec:
             value: "-Dlog4j2.formatMsgNoLookups=true"
           volumeMounts:
           - name: metadig-pv
-            mountPath: {{ .Values.persistence.mountPath }}
+            mountPath: {{ .Values.persistence.metadig.mountPath }}
             readOnly: false
           - name: metadig-config-volume
-            mountPath: {{ .Values.persistence.mountPath }}/metadig/metadig.properties
+            mountPath: {{ .Values.persistence.metadig.mountPath }}/metadig/metadig.properties
             subPath: metadig.properties
           - name: metadig-log4j-volume
-            mountPath: {{ .Values.persistence.mountPath }}/metadig/config/log4j.properties
+            mountPath: {{ .Values.persistence.metadig.mountPath }}/metadig/config/log4j.properties
             subPath: log4j.properties
+          - name: {{ .Values.persistence.metacat.claimName }}
+            mountPath: {{ .Values.persistence.metacat.mountPath }}
       volumes:
       - name: metadig-pv
         persistentVolumeClaim:
-          claimName: {{ .Values.persistence.claimName }}
+          claimName: {{ .Values.persistence.metadig.claimName }}
       - name: metadig-config-volume
         configMap:
           name: metadig-config-volume
@@ -60,6 +62,9 @@ spec:
         configMap:
           name: metadig-log4j-volume
           defaultMode: 0644
+      - name: {{ .Values.persistence.metadig.claimName }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.persistence.metadig.claimName }}
       restartPolicy: Always
       {{- with .Values.nodeSelector }}
       tolerations:
diff --git a/helm/metadig-worker/values.yaml b/helm/metadig-worker/values.yaml
index 08fa1a55..159ec914 100644
--- a/helm/metadig-worker/values.yaml
+++ b/helm/metadig-worker/values.yaml
@@ -89,32 +89,29 @@ tolerations: []
 affinity: {}
 
 persistence:
-  ## @param persistence.enabled Use a PVC to persist data.
-  ##
-  enabled: true
-  ## @param persistence.existingClaim A manually managed Persistent Volume and Claim
-  ## If defined, PVC must be created manually before volume will be bound
-  ## The value is evaluated as a template
-  ##
-  claimName: "cephfs-metadig-pvc"
-  ## @param persistence.storageClass Storage class of backing PVC
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ## set, choosing the default provisioner.
-  ##
-  storageClass: ""
-  ## @param persistence.accessModes Persistent Volume Access Modes
-  ##
-  accessModes: ReadWriteMany
-  ## @param persistence.size Size of data volume
-  ##
-  size: 20Gi
-  ## @param persistence.annotations Persistence annotations for Solr
-  ##
-  annotations: {}
-  ## @param persistence.mountPath Persistence mount path for Solr
-  ##
-  mountPath: "/opt/local"
+  metadig:
+    enabled: true
+    ## @param persistence.existingClaim
+    claimName: "cephfs-metadig-pvc"
+    ## @param persistence.storageClass Storage class of backing PVC
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ## set, choosing the default provisioner.
+    ##
+    storageClass: ""
+    accessModes: ReadWriteMany
+    size: 20Gi
+    ## @param persistence.annotations Persistence annotations for Solr
+    ##
+    annotations: {}
+    ## @param persistence.mountPath Persistence mount path for Solr
+    ##
+    mountPath: "/opt/local"
+
+  metacat:
+    claimName: metadig-worker-metacat-pvc
+    mountPath: "/var/data/metacat"
+    
 dns:
   config: true