Update helm chart templates and values to the latest config.yml templ…

…ate (#1016)
geopython · Sep 17, 2024 · 2e6edf8 · 2e6edf8
1 parent 75738da
commit 2e6edf8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/docker/helm/Chart.yaml b/docker/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: pycsw
 description: A Helm chart for pycsw
-version: 1.4.1
+version: 1.4.2
 appVersion: 3.0.0-dev0
diff --git a/docker/helm/templates/pycsw-configmap.yaml b/docker/helm/templates/pycsw-configmap.yaml
@@ -61,8 +61,8 @@ data:
 {{- end }}
 {{ end }}
     manager:
-{{ if .Values.pycsw.config.manager.transactions }}        transactions: {{ .Values.pycsw.config.manager.transactions }}
-{{ end }}{{ if .Values.pycsw.config.manager.allowed_ips }}        allowed_ips:
+        transactions: {{ .Values.pycsw.config.manager.transactions }}
+{{ if .Values.pycsw.config.manager.allowed_ips }}        allowed_ips:
 {{- range $.Values.pycsw.config.manager.allowed_ips }}
             - {{ . }}
 {{- end }}
@@ -79,9 +79,14 @@ data:
 {{ end }}{{ if .Values.pycsw.config.metadata.identification.keywords_type }}            keywords_type: {{ .Values.pycsw.config.metadata.identification.keywords_type }}
 {{ end }}{{ if .Values.pycsw.config.metadata.identification.fees }}            fees: {{ .Values.pycsw.config.metadata.identification.fees }}
 {{ end }}{{ if .Values.pycsw.config.metadata.identification.accessconstraints }}            accessconstraints: {{ .Values.pycsw.config.metadata.identification.accessconstraints }}
+{{ end }}{{ if .Values.pycsw.config.metadata.identification.terms_of_service }}            terms_of_service: {{ .Values.pycsw.config.metadata.identification.terms_of_service }}
+{{ end }}{{ if .Values.pycsw.config.metadata.identification.url }}            url: {{ .Values.pycsw.config.metadata.identification.url }}
+{{ end }}        license:
+{{ if .Values.pycsw.config.metadata.license.name }}            name: {{ .Values.pycsw.config.metadata.license.name }}
+{{ end }}{{ if .Values.pycsw.config.metadata.license.url }}            url: {{ .Values.pycsw.config.metadata.license.url }}
 {{ end }}        provider:
 {{ if .Values.pycsw.config.metadata.provider.name }}            name: {{ .Values.pycsw.config.metadata.provider.name }}
-{{ end }}{{ if .Values.pycsw.config.metadata.provider_url }}            url: {{ .Values.pycsw.config.metadata.provider.url }}
+{{ end }}{{ if .Values.pycsw.config.metadata.provider.url }}            url: {{ .Values.pycsw.config.metadata.provider.url }}
 {{ end }}        contact:
 {{ if .Values.pycsw.config.metadata.contact.name }}            name: {{ .Values.pycsw.config.metadata.contact.name }}
 {{ end }}{{ if .Values.pycsw.config.metadata.contact.position }}            position: {{ .Values.pycsw.config.metadata.contact.position }}
@@ -113,15 +118,16 @@ data:
 {{ end }}{{ if .Values.pycsw.config.metadata.inspire.contact_name }}            contact_name: {{ .Values.pycsw.config.metadata.inspire.contact_name }}
 {{ end }}{{ if .Values.pycsw.config.metadata.inspire.contact_email }}            contact_email: {{ .Values.pycsw.config.metadata.inspire.contact_email }}
 {{ end }}{{ if .Values.pycsw.config.metadata.inspire.temp_extent }}            temp_extent:
-{{- range $.Values.pycsw.config.metadata.inspire.temp_extent }}
-                - {{ . }}
+{{ if .Values.pycsw.config.metadata.inspire.temp_extent.begin }}                begin: {{ .Values.pycsw.config.metadata.inspire.temp_extent.begin }}
+{{ end }}{{ if .Values.pycsw.config.metadata.inspire.temp_extent.end }}                end: {{ .Values.pycsw.config.metadata.inspire.temp_extent.end }}
 {{- end }}
 {{ end }}
     repository:
 {{ if .Values.pycsw.config.repository.database }}        database: {{ .Values.pycsw.config.repository.database }}
 {{ end }}{{ if .Values.pycsw.config.repository.mappings }}        mappings: {{ .Values.pycsw.config.repository.mappings }}
 {{ end }}{{ if .Values.pycsw.config.repository.table }}        table: {{ .Values.pycsw.config.repository.table }}
 {{ end }}{{ if .Values.pycsw.config.repository.filter }}        filter: {{ .Values.pycsw.config.repository.filter }}
+{{ end }}{{ if .Values.pycsw.config.repository.max_retries }}        max_retries: {{ .Values.pycsw.config.repository.max_retries }}
 {{ end }}{{ if .Values.pycsw.config.repository.facets }}        facets:
 {{- range $.Values.pycsw.config.repository.facets }}
             - {{ . }}

diff --git a/docker/helm/values.yaml b/docker/helm/values.yaml
@@ -29,13 +29,11 @@ pycsw:
   volume_path: /etc/pycsw
   config:
     server:
-      home: /home/pycsw
       url: http://localhost:8000
       mimetype: application/xml; charset=UTF-8
       encoding: UTF-8
       language: en-US
       maxrecords: 10
-      # logfile: " "
       # ogc_schemas_base: http://foo
       # pretty_print: true
       # gzip_compresslevel: 8
@@ -44,17 +42,18 @@ pycsw:
       # spatial_ranking: true
       # workers: 2
       timeout: 30
+    logging:
+      level: DEBUG
+      # logfile: /tmp/pycsw.log
     profiles:
       - apiso
     # federatedcatalogues:
     #   - http://catalog.data.gov/csw
-    logging:
-      level: DEBUG
     manager:
       transactions: false
       allowed_ips:
         - 127.0.0.1
-      # csw_harvest_pagesize: 10
+      csw_harvest_pagesize: 10
     metadata:
       identification:
         title: pycsw Geospatial Catalogue
@@ -66,6 +65,11 @@ pycsw:
         keywords_type: theme
         fees: None
         accessconstraints: None
+        terms_of_service: https://creativecommons.org/licenses/by/4.0
+        url: https://example.org
+      license:
+        name: CC-BY 4.0 license
+        url: https://creativecommons.org/licenses/by/4.0
       provider:
         name: Organization Name
         url: https://pycsw.org/
@@ -104,6 +108,7 @@ pycsw:
       table: records
       # mappings: path/to/mappings.py
       # filter: type = 'http://purl.org/dc/dcmitype/Dataset'
+      # max_retries: 5
       facets:
         - type
         - title