Merge pull request #11 from tum-gis/devel

v1.1.4

CHANGELOG.md

@@ -8,6 +8,23 @@ Versions are prefixed with `sddi-ckan-` due to usage of
 [chart-releaser-action](https://github.com/helm/chart-releaser-action).
 For releases `< 1.0.0` minor version step indicate breaking changes.
 
+## [sddi-ckan-1.1.4] - 2023-08-06
+
+### Added
+
+- Added `ckan.licensesGroupUrl` config option.
+
+### Changed
+
+- Bump SDDI CKAN Image `1.1.2` --> `1.1.3`
+
+  - Removed default filter "read", see tum-gis/ckanext-grouphierarchy-sddi#17
+  - [Extended licenses list](https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/licenses_SDDI.json) required for SDDI added.
+
+### Removed
+
+- Removed `ckan.maintenanceMode` option, which hab no effect.
+
 ## [sddi-ckan-1.1.3] - 2023-07-24
 
 ### Changed
@@ -247,8 +264,9 @@ For releases `< 1.0.0` minor version step indicate breaking changes.
 
 ### Known issues
 
-[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.3...HEAD
+[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.4...HEAD
 
+[sddi-ckan-1.1.4]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.3...sddi-ckan-1.1.4
 [sddi-ckan-1.1.3]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.2...sddi-ckan-1.1.3
 [sddi-ckan-1.1.2]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.1...sddi-ckan-1.1.2
 [sddi-ckan-1.1.1]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.0...sddi-ckan-1.1.1

charts/sddi-ckan/Chart.yaml

@@ -10,8 +10,8 @@ sources:
   - https://www.asg.ed.tum.de/en/gis/projects/smart-district-data-infrastructure
   - https://github.com/tum-gis/ckan-docker
 
-version: 1.1.3
-appVersion: "1.1.2"
+version: 1.1.4
+appVersion: "1.1.3"
 kubeVersion: ">= 1.23.0"
 
 maintainers:

charts/sddi-ckan/README.md

@@ -1,6 +1,6 @@
 # sddi-ckan
 
-![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square)
+![Version: 1.1.4](https://img.shields.io/badge/Version-1.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.3](https://img.shields.io/badge/AppVersion-1.1.3-informational?style=flat-square)
 
 Helm Chart for a SDDI enabled CKAN catalog. See [CHANGELOG](https://github.com/tum-gis/sddi-ckan-k8s/blob/main/CHANGELOG.md) for changes.
 

charts/sddi-ckan/charts/ckan/Chart.yaml

@@ -9,8 +9,8 @@ sources:
   - https://github.com/tum-gis/ckan-docker
   - https://github.com/keitaroinc/docker-ckan
 
-version: 1.1.3
-appVersion: "1.1.2"
+version: 1.1.4
+appVersion: "1.1.3"
 
 maintainers:
   - email: [email protected]

charts/sddi-ckan/charts/ckan/README.md

@@ -1,6 +1,6 @@
 # ckan
 
-![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square)
+![Version: 1.1.4](https://img.shields.io/badge/Version-1.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.3](https://img.shields.io/badge/AppVersion-1.1.3-informational?style=flat-square)
 
 A Helm chart for SDDI enabled CKAN.
 
@@ -94,6 +94,7 @@ A Helm chart for SDDI enabled CKAN.
 | ingress.stickySessions.sessionCookie.name | string | `"route"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
 | ingress.stickySessions.sessionCookie.path | string | `"/"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
 | ingress.stickySessions.sessionCookie.secure | string | `"false"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
+| licensesGroupUrl | string | `"https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/licenses_SDDI.json"` | [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url): A URL pointing to a JSON file containing a list of license objects. |
 | liveness.failureThreshold | int | `6` | Failure threshold for the liveness probe |
 | liveness.initialDelaySeconds | int | `20` | Initial delay for the liveness probe |
 | liveness.periodSeconds | int | `10` | Check interval for the liveness probe |
@@ -102,7 +103,6 @@ A Helm chart for SDDI enabled CKAN.
 | locale.filtered_out | string | `"en_GB"` | CKAN locales filtered out, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) |
 | locale.offered | string | `"de en"` | CKAN locales offered, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) |
 | locale.order | string | `"de en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv"` | CKAN locale order, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) |
-| maintenanceMode | bool | `false` | Enable/disable maintenance mode. This is used to set MAINTENANCE_MODE env var. **Note:** Check, if this setting is supported by the CKAN image you are using. Set to "true" to enable. |
 | maxUploadSizeMB | int | `250` | Max file upload size in MB. Note: This setting is mapped to the `nginx.ingress.kubernetes.io/proxy-body-size: "600m"` and `nginx.org/client-max-body-size: "600m"` CKAN Ingress annotations too. |
 | nameOverride | string | `""` | Override name |
 | nodeSelector | object | `{}` | [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) |

charts/sddi-ckan/charts/ckan/templates/ckan-configMap-env.yml

@@ -46,6 +46,7 @@ data:
   CKAN__SITE_LOGO: {{ .Values.siteLogo | quote }}
   CKAN__FAVICON: {{ .Values.favicon | quote }}
   CKAN__SITE_ABOUT: {{ .Values.siteAbout | quote }}
+  CKAN___LICENSES_GROUP_URL: {{ .Values.ckan.licensesGroupUrl | quote }}
   # SDDI CKAN settings
   CKAN__GROUPHIERARCHY__INIT_DATA: {{ .Values.sddiInitDataJson | quote }}
   # Locale settings
@@ -74,7 +75,6 @@ data:
   {{- if .Values.webassets.path }}
   CKAN__WEBASSETS__PATH: {{ .Values.webassets.path | quote }}
   {{- end }}
-  MAINTENANCE_MODE: {{.Values.maintenanceMode | quote }}
   # Additional env vars from values.yaml
   {{- with .Values.extraEnv }}
     {{- toYaml . | nindent 2 }}

charts/sddi-ckan/charts/ckan/values.yaml

@@ -153,9 +153,9 @@ favicon: /base/images/ckan.ico
 # `nginx.ingress.kubernetes.io/proxy-body-size: "600m"` and
 # `nginx.org/client-max-body-size: "600m"` CKAN Ingress annotations too.
 maxUploadSizeMB: 250
-# -- Enable/disable maintenance mode. This is used to set MAINTENANCE_MODE env var.
-# **Note:** Check, if this setting is supported by the CKAN image you are using. Set to "true" to enable.
-maintenanceMode: false
+# -- [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url):
+# A URL pointing to a JSON file containing a list of license objects.
+licensesGroupUrl: "https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/licenses_SDDI.json"
 # -- [CKAN config dafault_views](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-views-default-views):
 # **Note**: Make sure the required view plugins are loaded!
 defaultViews: "image_view recline_view text_view geo_view geojson_view wmts_view shp_view"