From bb194dcdc4535d391f0659a9d6070e578b7d91f5 Mon Sep 17 00:00:00 2001
From: SyeKlu <sk@teuto.net>
Date: Tue, 3 Dec 2024 16:22:12 +0100
Subject: [PATCH] chore(ckan): add extra volumes to ckan (#1263)

---
 charts/ckan/templates/ckan/deployment.yaml |  6 ++++++
 charts/ckan/values.schema.json             | 12 ++++++++++++
 charts/ckan/values.yaml                    |  4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/charts/ckan/templates/ckan/deployment.yaml b/charts/ckan/templates/ckan/deployment.yaml
index c88655c4c..342c58c79 100644
--- a/charts/ckan/templates/ckan/deployment.yaml
+++ b/charts/ckan/templates/ckan/deployment.yaml
@@ -33,6 +33,9 @@ spec:
             name: my-configmap
         - name: api-tokens-volume
           emptyDir: {}
+        {{- with .Values.ckan.extraVolumes }}
+          {{- tpl (toYaml .) $ | nindent 8 -}}
+        {{- end }}
       securityContext:
       {{- toYaml .Values.ckan.podSecurityContext | default dict | nindent 8 }}
       containers:
@@ -200,6 +203,9 @@ spec:
             - name: "ckan"
               mountPath: /var/lib/ckan
               readOnly: false
+            {{- with .Values.ckan.extraVolumeMounts }}
+              {{- tpl (toYaml .) $ | nindent 12 -}}
+            {{- end }}
           ports:
             - name: http
               containerPort: {{ include "ckan.ckan.service.port" $ }}
diff --git a/charts/ckan/values.schema.json b/charts/ckan/values.schema.json
index 995e7ff4a..1cce7f5ff 100644
--- a/charts/ckan/values.schema.json
+++ b/charts/ckan/values.schema.json
@@ -73,6 +73,18 @@
           "default": [],
           "items": {}
         },
+        "extraVolumeMounts": {
+          "type": ["array", "string"],
+          "description": "Array with extra volume mounts variables to add to CKAN",
+          "default": [],
+          "items": {}
+        },
+        "extraVolumes": {
+          "type": ["array", "string"],
+          "description": "Array with extra volumes variables to add to CKAN",
+          "default": [],
+          "items": {}
+        },
         "siteId":{
           "type": "string",
           "description": "The search index is linked to the value of the ckan.site_id, so if you have more than one CKAN instance using the same solr_url, they will each have a separate search index as long as their ckan.site_id values are different."
diff --git a/charts/ckan/values.yaml b/charts/ckan/values.yaml
index 73e0544a6..b84c97df0 100644
--- a/charts/ckan/values.yaml
+++ b/charts/ckan/values.yaml
@@ -55,9 +55,11 @@ ckan:
     pullPolicy: IfNotPresent
     pullSecrets: []
     repository: teutonet/oci-images/ckan
-    tag: 1.0.10
+    tag: 1.0.11
     digest: ""
   extraEnvVars: []
+  extraVolumeMounts: []
+  extraVolumes: []
   ingress:
     ingressClassName: ""
     annotations: {}