From e4d942c3b23b815762711e5587b916ae3adde3cc Mon Sep 17 00:00:00 2001 From: Bruno Willenborg Date: Wed, 15 Mar 2023 09:31:49 +0100 Subject: [PATCH] Reduced resource requests --- CHANGELOG.md | 1 + charts/sddi-ckan/Chart.yaml | 2 +- charts/sddi-ckan/README.md | 2 +- charts/sddi-ckan/charts/postgis/README.md | 4 ++-- charts/sddi-ckan/charts/postgis/values.yaml | 4 ++-- charts/sddi-ckan/charts/solr/README.md | 2 +- charts/sddi-ckan/charts/solr/values.yaml | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b087413..280f306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ For releases `< 1.0.0` minor version step indicate breaking changes. - Updated database initialization for Datapusher database backend - Don't use PostGIS headless service by default - Changed default logo from CKAN to SDDI logo +- Reduced default resource requests for `postgis` and `solr` ### Removed diff --git a/charts/sddi-ckan/Chart.yaml b/charts/sddi-ckan/Chart.yaml index d85033a..6c816cc 100644 --- a/charts/sddi-ckan/Chart.yaml +++ b/charts/sddi-ckan/Chart.yaml @@ -9,7 +9,7 @@ sources: - https://github.com/tum-gis/sddi-ckan-k8s - https://www.asg.ed.tum.de/en/gis/projects/smart-district-data-infrastructure -version: 0.6.0-beta5 +version: 0.6.0-beta6 appVersion: "0.0.4" kubeVersion: ">= 1.23.0" diff --git a/charts/sddi-ckan/README.md b/charts/sddi-ckan/README.md index b41e740..b798814 100644 --- a/charts/sddi-ckan/README.md +++ b/charts/sddi-ckan/README.md @@ -1,6 +1,6 @@ # sddi-ckan -![Version: 0.6.0-beta5](https://img.shields.io/badge/Version-0.6.0--beta5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-informational?style=flat-square) +![Version: 0.6.0-beta6](https://img.shields.io/badge/Version-0.6.0--beta6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-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/postgis/README.md b/charts/sddi-ckan/charts/postgis/README.md index 4b7ab67..a3ef8d9 100644 --- a/charts/sddi-ckan/charts/postgis/README.md +++ b/charts/sddi-ckan/charts/postgis/README.md @@ -61,8 +61,8 @@ A Helm chart for sa simple PostGIS database pre-configured for CKAN. | 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 | `"1000m"` | [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | -| resources.requests.memory | string | `"2Gi"` | [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/) | | 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 153895c..723ec14 100644 --- a/charts/sddi-ckan/charts/postgis/values.yaml +++ b/charts/sddi-ckan/charts/postgis/values.yaml @@ -137,9 +137,9 @@ resources: memory: 4Gi requests: # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 1000m + cpu: 500m # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - memory: 2Gi + memory: 1Gi # -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) nodeSelector: {} diff --git a/charts/sddi-ckan/charts/solr/README.md b/charts/sddi-ckan/charts/solr/README.md index 14d4015..afed23d 100644 --- a/charts/sddi-ckan/charts/solr/README.md +++ b/charts/sddi-ckan/charts/solr/README.md @@ -41,7 +41,7 @@ A Helm chart for Solr pre-configured for CKAN and ckanext-spatial. | podSecurityContext | object | `{"fsGroup":8983,"runAsGroup":8983,"runAsUser":8983}` | [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 | `"1000m"` | [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/) | | securityContext | object | `{}` | [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | | service.port | int | `8983` | Service port for http | diff --git a/charts/sddi-ckan/charts/solr/values.yaml b/charts/sddi-ckan/charts/solr/values.yaml index 88f8530..be40900 100644 --- a/charts/sddi-ckan/charts/solr/values.yaml +++ b/charts/sddi-ckan/charts/solr/values.yaml @@ -78,7 +78,7 @@ resources: memory: 8Gi requests: # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) - cpu: 1000m + cpu: 500m # -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) memory: 1Gi