fix(ckan): add defaults for datapusher formats defaults (#1094)

Co-authored-by: mw <[email protected]>
teutonet · Aug 14, 2024 · f036735 · f036735
1 parent 754c8b8
commit f036735
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/.github/trusted_registries.yaml b/.github/trusted_registries.yaml
@@ -22,6 +22,8 @@ registries:
       gpg: ALL_TAGS
     otel:
       opentelemetry-collector-contrib: ALL_TAGS
+    ckan:
+      ckan-base-datapusher: ALL_TAGS
   ghcr.io:
     aquasecurity: ALL_IMAGES
     kyverno: ALL_IMAGES

diff --git a/charts/ckan/templates/_helpers.tpl b/charts/ckan/templates/_helpers.tpl
@@ -24,4 +24,8 @@
 
 {{- define "ckan.redis.fullname" -}}
 {{- include "common.names.dependency.fullname" (dict "chartName" "redis" "chartValues" .Values.redis "context" $) -}}
-{{- end -}}
+{{- end -}}
+
+{{- define "ckan.defaultRegistry" -}}
+docker.io
+{{- end -}}
diff --git a/charts/ckan/templates/ckan/deployment.yaml b/charts/ckan/templates/ckan/deployment.yaml
@@ -135,6 +135,8 @@ spec:
               value: "redis://{{ printf "%s-%s" (include "ckan.redis.fullname" . ) "headless" }}:{{ include "ckan.redis.service.port" $}}/0"
             - name: CKAN_DATAPUSHER_URL
               value: "http://{{ printf "%s-%s" (include "common.names.fullname" $) "datapusher" }}:{{ include "ckan.datapusher.service.port" $ }}"
+            - name: CKAN_DATAPUSHER_FORMATS
+              value: {{ .Values.ckan.datapusher.formats | join " " | quote }}
             - name: CKAN__DATAPUSHER__CALLBACK_URL_BASE
               value: "http://{{ printf "%s-%s" (include "common.names.fullname" $) "ckan" }}:{{ include "ckan.ckan.service.port" $ }}/"
             - name: CKAN__PLUGINS

diff --git a/charts/ckan/templates/datapusher/deployment.yaml b/charts/ckan/templates/datapusher/deployment.yaml
@@ -32,7 +32,7 @@ spec:
           #    value: "postgresql://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@main-postgresql/{{ .Values.postgresql.auth.database}}"
           securityContext:
           {{- toYaml .Values.datapusher.securityContext | default dict | nindent 12 }}
-          image: {{ include "common.images.image" (dict "imageRoot" .Values.datapusher.image "global" .Values.global) }}
+          image: {{ printf "%s/%s" ($.Values.global.imageRegistry | default (include "ckan.defaultRegistry" (dict))) (include "common.images.image" (dict "imageRoot" .Values.datapusher.image "global" .Values.global)) }}
           imagePullPolicy: {{ .Values.datapusher.image.pullPolicy }}
           ports:
             - name: datapusher

diff --git a/charts/ckan/values.schema.json b/charts/ckan/values.schema.json
@@ -72,6 +72,21 @@
           },
           "description": "The enabled plugins in the Ckan instance."
         },
+        "datapusher": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "formats": {
+              "type": "array",
+              "items": {
+                "items": {
+                  "type": "string"
+                }
+              },
+              "description": "The enabled formats for the datapusher."
+            }
+          }
+        },
         "image": {
           "$ref": "#/$defs/image"
         },

diff --git a/charts/ckan/values.yaml b/charts/ckan/values.yaml
@@ -33,6 +33,17 @@ ckan:
     - recline_view
     - datastore
     - datapusher
+  datapusher:
+    formats:
+      - csv
+      - xls
+      - xlsx
+      - tsv
+      - application/csv
+      - application/vnd.ms-excel
+      - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+      - ods
+      - application/vnd.oasis.opendocument.spreadsheet
   image:
     registry: "ghcr.io"
     pullPolicy: IfNotPresent