From 307ba1a090952cfa60ac00e4e18a7bf0368ee66b Mon Sep 17 00:00:00 2001 From: Bruno Willenborg Date: Mon, 21 Aug 2023 12:38:42 +0200 Subject: [PATCH] v1.2.1 --- CHANGELOG.md | 12 +++++++++--- charts/sddi-ckan/Chart.yaml | 2 +- charts/sddi-ckan/README.md | 2 +- charts/sddi-ckan/charts/ckan/Chart.yaml | 2 +- charts/sddi-ckan/charts/ckan/README.md | 8 ++++---- charts/sddi-ckan/charts/ckan/templates/_helpers.tpl | 2 +- charts/sddi-ckan/charts/ckan/values.yaml | 10 +++++----- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73cfc73..94251c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ For releases `< 1.0.0` minor version step indicate breaking changes. ## [Unreleased] - YYYY-MM-DD +## [sddi-ckan-1.2.1] - 2023-08-21 + +### Fixed + +- Fixed error in SQL alchemy database URL +- Several minor docs fixes + ## [sddi-ckan-1.2.0] - 2023-08-21 ### Added @@ -285,10 +292,9 @@ is displayed when navigating to the _Datasets_ view of CKAN. ### Known issues -## [Unreleased] - YYYY-MM-DD - -[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.0...HEAD +[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.1...HEAD +[sddi-ckan-1.2.1]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.0...sddi-ckan-1.2.1 [sddi-ckan-1.2.0]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.7...sddi-ckan-1.2.0 [sddi-ckan-1.1.7]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.6...sddi-ckan-1.1.7 [sddi-ckan-1.1.6]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.5...sddi-ckan-1.1.6 diff --git a/charts/sddi-ckan/Chart.yaml b/charts/sddi-ckan/Chart.yaml index 9e1ee23..6341d28 100644 --- a/charts/sddi-ckan/Chart.yaml +++ b/charts/sddi-ckan/Chart.yaml @@ -10,7 +10,7 @@ sources: - https://www.asg.ed.tum.de/en/gis/projects/smart-district-data-infrastructure - https://github.com/tum-gis/ckan-docker -version: 1.2.0 +version: 1.2.1 appVersion: "1.2.0" kubeVersion: ">= 1.23.0" diff --git a/charts/sddi-ckan/README.md b/charts/sddi-ckan/README.md index 205eb79..668d35f 100644 --- a/charts/sddi-ckan/README.md +++ b/charts/sddi-ckan/README.md @@ -1,6 +1,6 @@ # sddi-ckan -![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square) +![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-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. diff --git a/charts/sddi-ckan/charts/ckan/Chart.yaml b/charts/sddi-ckan/charts/ckan/Chart.yaml index fd241ad..05949f8 100644 --- a/charts/sddi-ckan/charts/ckan/Chart.yaml +++ b/charts/sddi-ckan/charts/ckan/Chart.yaml @@ -9,7 +9,7 @@ sources: - https://github.com/tum-gis/ckan-docker - https://github.com/keitaroinc/docker-ckan -version: 1.2.0 +version: 1.2.1 appVersion: "1.2.0" maintainers: diff --git a/charts/sddi-ckan/charts/ckan/README.md b/charts/sddi-ckan/charts/ckan/README.md index 6a21a26..6976b62 100644 --- a/charts/sddi-ckan/charts/ckan/README.md +++ b/charts/sddi-ckan/charts/ckan/README.md @@ -1,6 +1,6 @@ # ckan -![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square) +![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square) A Helm chart for SDDI enabled CKAN. @@ -26,8 +26,8 @@ A Helm chart for SDDI enabled CKAN. | activityStreams.enabled | bool | `true` | [CKAN config enable activity streams](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-activity-streams-enabled) | | affinity | object | `{}` | [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) | | apiToken.algorithm | string | `"HS256"` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-algorithm) | -| apiToken.decodeSecret | string | `nil` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-decode-secret): If left empty, a random 64 char alpha numberic string is generated. **Note:** In a production environment the default needs to be overwritten. Check the docs! Depending on `apiToken.algorithm` additional restricitions apply to this settings. | -| apiToken.encodeSecret | string | `nil` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-encode-secret): If left empty, a random 64 char alpha numberic string is generated. **Note:** In a production environment the default needs to be overwritten. Check the docs! Depending on `apiToken.algorithm` additional restricitions apply to this settings. | +| apiToken.decodeSecret | string | `nil` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-decode-secret): If left empty, a random 64 char alpha numeric string is generated. **Note:** In a production environment the default needs to be overwritten. Check the docs! Depending on `apiToken.algorithm` additional restrictions apply to this settings. | +| apiToken.encodeSecret | string | `nil` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-encode-secret): If left empty, a random 64 char alpha numeric string is generated. **Note:** In a production environment the default needs to be overwritten. Check the docs! Depending on `apiToken.algorithm` additional restrictions apply to this settings. | | apiToken.nBytes | int | `64` | [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-nbytes) | | auth.allow_dataset_collaborators | bool | `false` | CKAN authorization settings. See [CKAN configuration docs](https://docs.ckan.org/en/latest/maintaining/configuration.html#authorization-settings). | | auth.anon_create_dataset | bool | `false` | | @@ -56,7 +56,7 @@ A Helm chart for SDDI enabled CKAN. | datapusher.url | string | `"http://datapusher:8000/"` | DataPusher endpoint of CKAN. This should be set to the cluster internal DataPusher service domain. | | datastore.auth.ro.password | string | `"changeMe"` | CKAN datastore read only password, used to build `ckan.datastore.read_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | | datastore.auth.ro.username | string | `"datastore_ro"` | CKAN datastore read only username, used to build `ckan.datastore.read_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | -| datastore.auth.rw.password | string | `"changeMe"` | CKAN datastore read write passowrd, used to build `ckan.datastore.write_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | +| datastore.auth.rw.password | string | `"changeMe"` | CKAN datastore read write password, used to build `ckan.datastore.write_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | | datastore.auth.rw.username | string | `"datastore_rw"` | CKAN datastore read write username, used to build `ckan.datastore.write_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | | datastore.dbname | string | `"datastore"` | CKAN datastore database name, used to build `ckan.datastore.read/write_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | | datastore.host | string | `"postgis"` | CKAN datastore host, used to build `ckan.datastore.read/write_url` see [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) | diff --git a/charts/sddi-ckan/charts/ckan/templates/_helpers.tpl b/charts/sddi-ckan/charts/ckan/templates/_helpers.tpl index e7d2f72..157592e 100644 --- a/charts/sddi-ckan/charts/ckan/templates/_helpers.tpl +++ b/charts/sddi-ckan/charts/ckan/templates/_helpers.tpl @@ -65,7 +65,7 @@ Create the name of the service account to use SQL alchemy url */}} {{- define "ckan.sqlalchemy.url" -}} - postgresql:// + postgres:// {{- .Values.global.db.auth.username | default .Values.db.auth.username -}}: {{- .Values.global.db.auth.password | default .Values.db.auth.password -}}@ {{- .Values.global.db.host | default .Values.db.host -}}: diff --git a/charts/sddi-ckan/charts/ckan/values.yaml b/charts/sddi-ckan/charts/ckan/values.yaml index 48c6738..12932fc 100644 --- a/charts/sddi-ckan/charts/ckan/values.yaml +++ b/charts/sddi-ckan/charts/ckan/values.yaml @@ -258,14 +258,14 @@ apiToken: # -- [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-algorithm) algorithm: HS256 # -- [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-encode-secret): - # If left empty, a random 64 char alpha numberic string is generated. + # If left empty, a random 64 char alpha numeric string is generated. # **Note:** In a production environment the default needs to be overwritten. - # Check the docs! Depending on `apiToken.algorithm` additional restricitions apply to this settings. + # Check the docs! Depending on `apiToken.algorithm` additional restrictions apply to this settings. encodeSecret: # -- [CKAN API token settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-jwt-decode-secret): - # If left empty, a random 64 char alpha numberic string is generated. + # If left empty, a random 64 char alpha numeric string is generated. # **Note:** In a production environment the default needs to be overwritten. - # Check the docs! Depending on `apiToken.algorithm` additional restricitions apply to this settings. + # Check the docs! Depending on `apiToken.algorithm` additional restrictions apply to this settings. decodeSecret: locale: @@ -357,7 +357,7 @@ datastore: # -- CKAN datastore read write username, used to build `ckan.datastore.write_url` see # [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) username: datastore_rw - # -- CKAN datastore read write passowrd, used to build `ckan.datastore.write_url` see + # -- CKAN datastore read write password, used to build `ckan.datastore.write_url` see # [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) password: changeMe