diff --git a/CHANGELOG.md b/CHANGELOG.md index 68e53ad..770fbf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,14 @@ 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.3.0-beta1] - 2023-10-08 +## [sddi-ckan-2.0.0] - 2023-11-02 [@klml](https://github.com/klml), [@eidottermihi](https://github.com/eidottermihi) made their first contributions! +## Breaking + +- Removed default resource requirements/limits for all services, tum-gis/sddi-ckan-k8s#28, tum-gis/sddi-ckan-k8s#29 + ## Added - Allow configuration of images used for init containers. tum-gis/sddi-ckan-k8s#24 diff --git a/charts/sddi-ckan/charts/ckan/Chart.yaml b/charts/sddi-ckan/charts/ckan/Chart.yaml index ee41e6f..d01f5cb 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.3.0 +version: 1.3.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 e920566..20faffe 100644 --- a/charts/sddi-ckan/charts/ckan/README.md +++ b/charts/sddi-ckan/charts/ckan/README.md @@ -1,6 +1,6 @@ # ckan -![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.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.3.1](https://img.shields.io/badge/Version-1.3.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. @@ -129,10 +129,7 @@ A Helm chart for SDDI enabled CKAN. | readiness.timeoutSeconds | int | `10` | Timeout interval for the liveness probe | | redis.url | string | `"redis://redis-hl:6379/0"` | Redis endpoint for CKAN. This should be set to cluster internal Redis service domain. [CKAN configuration Redis](https://docs.ckan.org/en/latest/maintaining/configuration.html#redis-settings) | | replicaCount | int | `1` | Number of replicas. Only used if `autoscaling.enabled = false`. **Note:** Running multiple replicas requires to enable persistent data storage (`persistence.enabled = true`) and, if Pods run on different nodes, a storage that supports RWX. | -| resources.limits.cpu | string | `"500m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.limits.memory | string | `"1Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.cpu | string | `"250m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"256Mi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | +| resources | object | `{}` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | sddiInitDataJson | string | `"init_data.json"` | Local path or URL to File path or URL to [CKAN SDDI `init_data.json`](https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/init_data.json). This file allows to specify pre-defined set of SDDI CKAN main categories, topics, and organizations. | | securityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | service.port | int | `5000` | Service port for http | diff --git a/charts/sddi-ckan/charts/ckan/values.yaml b/charts/sddi-ckan/charts/ckan/values.yaml index 93ac809..ef8179b 100755 --- a/charts/sddi-ckan/charts/ckan/values.yaml +++ b/charts/sddi-ckan/charts/ckan/values.yaml @@ -433,18 +433,8 @@ activityStreams: # -- [CKAN config activity stream](https://docs.ckan.org/en/latest/maintaining/configuration.html#activity-streams-settings) emailNotifications: True -resources: - limits: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 500m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 1Gi - requests: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 250m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 256Mi - +# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) +resources: {} # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} # -- [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) diff --git a/charts/sddi-ckan/charts/datapusher/Chart.yaml b/charts/sddi-ckan/charts/datapusher/Chart.yaml index 19e8716..cf21090 100644 --- a/charts/sddi-ckan/charts/datapusher/Chart.yaml +++ b/charts/sddi-ckan/charts/datapusher/Chart.yaml @@ -9,7 +9,7 @@ sources: - https://github.com/tum-gis/sddi-ckan-k8s/tree/main/sddi-ckan/charts/charts/datapusher - https://github.com/keitaroinc/docker-ckan -version: 0.5.0 +version: 0.5.1 appVersion: "0.0.19" maintainers: diff --git a/charts/sddi-ckan/charts/datapusher/README.md b/charts/sddi-ckan/charts/datapusher/README.md index 962bc84..800209f 100644 --- a/charts/sddi-ckan/charts/datapusher/README.md +++ b/charts/sddi-ckan/charts/datapusher/README.md @@ -1,6 +1,6 @@ # datapusher -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.19](https://img.shields.io/badge/AppVersion-0.0.19-informational?style=flat-square) +![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.19](https://img.shields.io/badge/AppVersion-0.0.19-informational?style=flat-square) A Helm chart for CKAN Datapusher. @@ -56,10 +56,7 @@ A Helm chart for CKAN Datapusher. | podAnnotations | object | `{}` | Additional pod annotations | | podSecurityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | replicaCount | int | `1` | Number of replicas. Only used if `autoscaling.enabled = false`. | -| resources.limits.cpu | string | `"1000m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.limits.memory | string | `"500Mi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.cpu | string | `"250m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"256Mi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | +| resources | object | `{}` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | securityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | service.port | int | `8000` | Service port | | service.type | string | `"ClusterIP"` | Type of service | diff --git a/charts/sddi-ckan/charts/datapusher/values.yaml b/charts/sddi-ckan/charts/datapusher/values.yaml index 284fb85..572f2c3 100755 --- a/charts/sddi-ckan/charts/datapusher/values.yaml +++ b/charts/sddi-ckan/charts/datapusher/values.yaml @@ -129,20 +129,8 @@ db: # Note: This values is overwritten by `global.datapusher.db.auth.password`, if set. password: changeMe - - -resources: - limits: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 1000m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 500Mi - requests: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 250m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 256Mi - +# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) +resources: {} # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} # -- [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) diff --git a/charts/sddi-ckan/charts/postgis/Chart.yaml b/charts/sddi-ckan/charts/postgis/Chart.yaml index 89e11e7..46cfa7d 100644 --- a/charts/sddi-ckan/charts/postgis/Chart.yaml +++ b/charts/sddi-ckan/charts/postgis/Chart.yaml @@ -8,7 +8,7 @@ sources: - https://github.com/tum-gis/sddi-ckan-k8s/tree/main/sddi-ckan/charts/charts/postgis - https://registry.hub.docker.com/r/postgis/postgis/ -version: 0.6.0 +version: 0.6.1 appVersion: "14-3.3" maintainers: diff --git a/charts/sddi-ckan/charts/postgis/README.md b/charts/sddi-ckan/charts/postgis/README.md index 8aa872c..e3ecfcb 100644 --- a/charts/sddi-ckan/charts/postgis/README.md +++ b/charts/sddi-ckan/charts/postgis/README.md @@ -1,6 +1,6 @@ # postgis -![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 14-3.3](https://img.shields.io/badge/AppVersion-14--3.3-informational?style=flat-square) +![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 14-3.3](https://img.shields.io/badge/AppVersion-14--3.3-informational?style=flat-square) A Helm chart for sa simple PostGIS database pre-configured for CKAN. @@ -59,10 +59,7 @@ A Helm chart for sa simple PostGIS database pre-configured for CKAN. | persistence.storageClassName | string | `nil` | StorageClass to use, leave empty to use default StorageClass. | | podAnnotations | object | `{}` | Additional pod annotations | | podSecurityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | -| resources.limits.cpu | string | `"2000m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.limits.memory | string | `"4Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.cpu | string | `"500m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"1Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | +| resources | object | `{}` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | securityContext | string | `nil` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | serviceAccount.annotations | object | `{}` | Annotations to add to the service account | | serviceAccount.create | bool | `false` | Specifies whether a service account should be created | diff --git a/charts/sddi-ckan/charts/postgis/values.yaml b/charts/sddi-ckan/charts/postgis/values.yaml index 723ec14..b33bffb 100644 --- a/charts/sddi-ckan/charts/postgis/values.yaml +++ b/charts/sddi-ckan/charts/postgis/values.yaml @@ -129,18 +129,8 @@ debug: # -- Enable/disable query logging queryLogging: false -resources: - limits: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 2000m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 4Gi - requests: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 500m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 1Gi - +# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) +resources: {} # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} # -- [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) diff --git a/charts/sddi-ckan/charts/redis/Chart.yaml b/charts/sddi-ckan/charts/redis/Chart.yaml index 26a81f9..5026475 100644 --- a/charts/sddi-ckan/charts/redis/Chart.yaml +++ b/charts/sddi-ckan/charts/redis/Chart.yaml @@ -9,7 +9,7 @@ sources: - https://hub.docker.com/_/redis -version: 0.2.0 +version: 0.2.1 appVersion: "7.0.8-alpine" maintainers: diff --git a/charts/sddi-ckan/charts/redis/README.md b/charts/sddi-ckan/charts/redis/README.md index 4627ca4..9002e4c 100644 --- a/charts/sddi-ckan/charts/redis/README.md +++ b/charts/sddi-ckan/charts/redis/README.md @@ -1,6 +1,6 @@ # redis -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.8-alpine](https://img.shields.io/badge/AppVersion-7.0.8--alpine-informational?style=flat-square) +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.8-alpine](https://img.shields.io/badge/AppVersion-7.0.8--alpine-informational?style=flat-square) A Helm chart for basic Redis for use with CKAN. @@ -46,10 +46,7 @@ A Helm chart for basic Redis for use with CKAN. | podAnnotations | object | `{}` | Additional pod annotations | | podSecurityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | replicaCount | int | `1` | Number of replicas. Only used if `autoscaling.enabled = false`. | -| resources.limits.cpu | string | `"500m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.limits.memory | string | `"1Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.cpu | string | `"250m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"256Mi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | +| resources | object | `{}` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | securityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | service.port | int | `6379` | Service port for http | | service.type | string | `"ClusterIP"` | Type of service for http | diff --git a/charts/sddi-ckan/charts/redis/values.yaml b/charts/sddi-ckan/charts/redis/values.yaml index 4ef8806..8abcdb1 100644 --- a/charts/sddi-ckan/charts/redis/values.yaml +++ b/charts/sddi-ckan/charts/redis/values.yaml @@ -88,18 +88,8 @@ service: # -- Service port for http port: 6379 -resources: - limits: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 500m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 1Gi - requests: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 250m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 256Mi - +# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) +resources: {} # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} # -- [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) diff --git a/charts/sddi-ckan/charts/solr/Chart.yaml b/charts/sddi-ckan/charts/solr/Chart.yaml index a734019..07eae2d 100644 --- a/charts/sddi-ckan/charts/solr/Chart.yaml +++ b/charts/sddi-ckan/charts/solr/Chart.yaml @@ -8,7 +8,7 @@ sources: - https://github.com/ckan/ckan-solr - https://github.com/ckan/ckanext-spatial -version: 0.3.1 +version: 0.3.2 appVersion: "2.9-solr8-spatial" maintainers: diff --git a/charts/sddi-ckan/charts/solr/README.md b/charts/sddi-ckan/charts/solr/README.md index aaf6b0a..88cf639 100644 --- a/charts/sddi-ckan/charts/solr/README.md +++ b/charts/sddi-ckan/charts/solr/README.md @@ -1,6 +1,6 @@ # solr -![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![AppVersion: 2.9-solr8-spatial](https://img.shields.io/badge/AppVersion-2.9--solr8--spatial-informational?style=flat-square) +![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![AppVersion: 2.9-solr8-spatial](https://img.shields.io/badge/AppVersion-2.9--solr8--spatial-informational?style=flat-square) A Helm chart for Solr pre-configured for CKAN and ckanext-spatial. @@ -39,10 +39,7 @@ A Helm chart for Solr pre-configured for CKAN and ckanext-spatial. | persistence.storageClassName | string | `nil` | StorageClass to use, leave empty to use default StorageClass. | | podAnnotations | object | `{}` | Additional pod annotations | | podSecurityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | -| resources.limits.cpu | string | `"2000m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.limits.memory | string | `"8Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.cpu | string | `"500m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"1Gi"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | +| resources | object | `{}` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | securityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | service.port | int | `8983` | Service port for http | | service.type | string | `"ClusterIP"` | Type of service for http | diff --git a/charts/sddi-ckan/charts/solr/values.yaml b/charts/sddi-ckan/charts/solr/values.yaml index a9b58e6..ecf2a46 100644 --- a/charts/sddi-ckan/charts/solr/values.yaml +++ b/charts/sddi-ckan/charts/solr/values.yaml @@ -70,18 +70,8 @@ persistence: annotations: # helm.sh/resource-policy: keep -resources: - limits: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 2000m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 8Gi - requests: - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 500m - # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 1Gi - +# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) +resources: {} # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} # -- [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)