diff --git a/charts/sddi-ckan/charts/datapusher-plus/README.md b/charts/sddi-ckan/charts/datapusher-plus/README.md index 1515979..c9cf8ac 100644 --- a/charts/sddi-ckan/charts/datapusher-plus/README.md +++ b/charts/sddi-ckan/charts/datapusher-plus/README.md @@ -30,6 +30,7 @@ A Helm chart for CKAN Datapusher-plus. | autoscaling.targetMemoryUtilizationPercentage | string | `nil` | [HorizontalPodAutoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/). | | chunkSize | string | `"16384"` | Size of chunks of the data that is being downloaded in bytes | | component | string | `"datapusher"` | Role of CKAN Datapusher in this chart | +| databaseUri | string | `"sqlite:////tmp/job_store.db"` | SQLAlchemy Database URL for job store, see [Datapusher config](https://github.com/ckan/datapusher#datapusher-configuration) for more. Note: If `db.enabled` this setting is ignored. | | datapusherRewriteResources | bool | `true` | Enable or disable (boolean) whether Datapusher should rewrite resources uploaded to CKAN's filestore, since Datapusher takes the CKAN Site URL value for generating the resource URL. Default: False | | datapusherRewriteUrl | string | `"http://ckan:5000/"` | Sets the rewrite URL that Datapusher will rewrite resources that are uploaded to CKAN's filestore. Default: http://ckan:5000 | | datapusherSslVerify | bool | `false` | Enable or disable (boolean) verification of SSL when trying to get resources. Default: True | diff --git a/charts/sddi-ckan/charts/datapusher-plus/templates/_helpers.tpl b/charts/sddi-ckan/charts/datapusher-plus/templates/_helpers.tpl index 9502d89..015a03b 100644 --- a/charts/sddi-ckan/charts/datapusher-plus/templates/_helpers.tpl +++ b/charts/sddi-ckan/charts/datapusher-plus/templates/_helpers.tpl @@ -65,12 +65,16 @@ Create the name of the service account to use SQL alchemy url */}} {{- define "datapusher-plus.sqlalchemy.url" -}} + {{- if .Values.global.datapusher.db.enabled | default .Values.db.enabled -}} postgresql:// {{- .Values.global.datapusher.db.auth.username | default .Values.db.auth.username -}}: {{- .Values.global.datapusher.db.auth.password | default .Values.db.auth.password -}}@ {{- .Values.global.datapusher.db.host | default .Values.db.host -}}: {{- .Values.global.datapusher.db.port | default .Values.db.port -}}/ {{- .Values.global.datapusher.db.dbname | default .Values.db.dbname -}} + {{- else -}} + {{ .Values.databaseUri }} + {{- end }} {{- end }} {{/* diff --git a/charts/sddi-ckan/charts/datapusher-plus/values.yaml b/charts/sddi-ckan/charts/datapusher-plus/values.yaml index 6ba2776..5b51bbb 100644 --- a/charts/sddi-ckan/charts/datapusher-plus/values.yaml +++ b/charts/sddi-ckan/charts/datapusher-plus/values.yaml @@ -92,6 +92,7 @@ datapusherRewriteUrl: http://ckan:5000/ # -- SQLAlchemy Database URL for job store, see # [Datapusher config](https://github.com/ckan/datapusher#datapusher-configuration) for more. # Note: If `db.enabled` this setting is ignored. +databaseUri: 'sqlite:////tmp/job_store.db' datastore: # -- Datapusher plus write engine URL host