From 155762c90ef5870d75685027a4906c82c93a68a7 Mon Sep 17 00:00:00 2001 From: Maciej Laskowski <19705838+malaskowski@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:27:28 +0200 Subject: [PATCH] Remove default resource limits from chart componenets --- README.md | 15 ++------- .../templates/cms/cms-deployment.yaml | 9 ++--- .../templates/mongo/mongo-deployment.yaml | 9 ++--- .../templates/nginx/nginx-deployment.yaml | 9 ++--- websight-cms/values.yaml | 33 +++++-------------- 5 files changed, 21 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 9d623bc..75c0645 100644 --- a/README.md +++ b/README.md @@ -76,10 +76,7 @@ The command removes all the Kubernetes components associated with the chart and | cms.readinessProbe.successThreshold | int | `1` | | | cms.readinessProbe.timeoutSeconds | int | `10` | | | cms.replicas | int | `1` | number of WebSight CMS replicas | -| cms.resources.limits.cpu | string | `"1000m"` | WebSight CMS limits cpu resources | -| cms.resources.limits.memory | string | `"4Gi"` | WebSight CMS limits memory resources | -| cms.resources.requests.cpu | string | `"500m"` | WebSight CMS request cpu resources | -| cms.resources.requests.memory | string | `"1Gi"` | WebSight CMS request memory resources | +| cms.resources | object | `{}` | WebSight CMS container's resources settings | | ingress.annotations | object | `{"kubernetes.io/ingress.class":"nginx","nginx.ingress.kubernetes.io/proxy-body-size":"5m"}` | custom ingress annotations | | ingress.enabled | bool | `false` | enables ingress | | ingress.hosts.cms | string | `"cms.127.0.0.1.nip.io"` | cms panel host | @@ -96,10 +93,7 @@ The command removes all the Kubernetes components associated with the chart and | mongo.livenessProbe.timeoutSeconds | int | `5` | | | mongo.nodeSelector | object | `nil` | MongoDB node selector | | mongo.replicas | int | `1` | number of MongoDB replicas - valid values are `0` or `1`, do not set above `1` | -| mongo.resources.limits.cpu | string | `"1000m"` | MongoDB limits cpu resources | -| mongo.resources.limits.memory | string | `"4Gi"` | MongoDB limits memory resources | -| mongo.resources.requests.cpu | string | `"500m"` | MongoDB request cpu resources | -| mongo.resources.requests.memory | string | `"1Gi"` | MongoDB request memory resources | +| mongo.resources | object | `{}` | MongoDB resources settings | | mongo.storage.size | string | `"2Gi"` | MongoDB Repository volume size | | nginx.configurationTemplates | list | `[]` | list of Nginx custom templates that will be atached to the container under `/etc/nginx/templates/` directory using `configMapRef` and processed by `envsubst` command during the entrypoint execution, read more [here](https://hub.docker.com/_/nginx#:~:text=Using%20environment%20variables%20in%20nginx%20configuration) | | nginx.customServerConfigurations | list | `[]` | list of Nginx custom configs that will be atached to the container under `/etc/nginx/conf.d/` directory using `configMapRef` | @@ -117,10 +111,7 @@ The command removes all the Kubernetes components associated with the chart and | nginx.livenessProbe.timeoutSeconds | int | `1` | | | nginx.nodeSelector | object | `nil` | WebSight Nginx node selector | | nginx.replicas | int | `2` | number of Web Server replicas | -| nginx.resources.limits.cpu | string | `"100m"` | WebSight Nginx limits cpu resources | -| nginx.resources.limits.memory | string | `"100Mi"` | WebSight Nginx limits memory resources | -| nginx.resources.requests.cpu | string | `"50m"` | WebSight Nginx request cpu resources | -| nginx.resources.requests.memory | string | `"50Mi"` | WebSight Nginx request memory resources | +| nginx.resources | object | `{}` | WebSight Nginx resources settings | | siteRepository.enabled | bool | `true` | enables Site Repository volume | | siteRepository.rwxStorageClassName | string | `nil` | Configure storageClassName in case you want to use `ReadWriteMany` access mode | | siteRepository.storage.size | string | `"2Gi"` | Site Repository volume size | diff --git a/websight-cms/templates/cms/cms-deployment.yaml b/websight-cms/templates/cms/cms-deployment.yaml index ec4c13f..d4db9db 100644 --- a/websight-cms/templates/cms/cms-deployment.yaml +++ b/websight-cms/templates/cms/cms-deployment.yaml @@ -60,13 +60,10 @@ spec: - name: debug containerPort: 5005 {{- end }} + {{- if .Values.cms.resources }} resources: - requests: - memory: {{ .Values.cms.resources.requests.memory }} - cpu: {{ .Values.cms.resources.requests.cpu }} - limits: - memory: {{ .Values.cms.resources.limits.memory }} - cpu: {{ .Values.cms.resources.limits.cpu }} +{{ toYaml .Values.cms.resources | indent 12 }} + {{- end }} volumeMounts: {{- if .Values.cms.customAdminSecret }} - name: admin-password diff --git a/websight-cms/templates/mongo/mongo-deployment.yaml b/websight-cms/templates/mongo/mongo-deployment.yaml index 9302978..5e9ef2a 100644 --- a/websight-cms/templates/mongo/mongo-deployment.yaml +++ b/websight-cms/templates/mongo/mongo-deployment.yaml @@ -35,13 +35,10 @@ spec: name: mongo ports: - containerPort: 27017 + {{- if .Values.mongo.resources }} resources: - requests: - memory: {{ .Values.mongo.resources.requests.memory }} - cpu: {{ .Values.mongo.resources.requests.cpu }} - limits: - memory: {{ .Values.mongo.resources.limits.memory }} - cpu: {{ .Values.mongo.resources.limits.cpu }} +{{ toYaml .Values.cms.resources | indent 12 }} + {{- end }} volumeMounts: - mountPath: /data/db name: mongo-repository diff --git a/websight-cms/templates/nginx/nginx-deployment.yaml b/websight-cms/templates/nginx/nginx-deployment.yaml index 1b1b000..bcde27f 100644 --- a/websight-cms/templates/nginx/nginx-deployment.yaml +++ b/websight-cms/templates/nginx/nginx-deployment.yaml @@ -40,13 +40,10 @@ spec: {{- end }} ports: - containerPort: 80 + {{- if .Values.nginx.resources }} resources: - requests: - memory: {{ .Values.nginx.resources.requests.memory }} - cpu: {{ .Values.nginx.resources.requests.cpu }} - limits: - memory: {{ .Values.nginx.resources.limits.memory }} - cpu: {{ .Values.nginx.resources.limits.cpu }} +{{ toYaml .Values.nginx.resources | indent 12 }} + {{- end }} volumeMounts: - name: tmp-config mountPath: /tmp/nginx/conf.d diff --git a/websight-cms/values.yaml b/websight-cms/values.yaml index d76fead..15b7501 100644 --- a/websight-cms/values.yaml +++ b/websight-cms/values.yaml @@ -27,17 +27,12 @@ cms: envsFromConfig: [] # -- Name of the secret (without release name prefix) where custom admin password is stored under `WS_ADMIN_PASSWORD` key customAdminSecret: + # -- WebSight CMS container's resources settings resources: + # @ignored in generated docs requests: - # -- WebSight CMS request memory resources - memory: 1Gi - # -- WebSight CMS request cpu resources cpu: 500m - limits: - # -- WebSight CMS limits memory resources - memory: 4Gi - # -- WebSight CMS limits cpu resources - cpu: 1000m + memory: 1Gi livenessProbe: # -- enables WebSight CMS pods liveness probe enabled: true @@ -98,17 +93,12 @@ nginx: # @ignored in generated docs - key: nocodeluna-site.template path: nocodeluna-site.template + # -- WebSight Nginx resources settings resources: + # @ignored in generated docs requests: - # -- WebSight Nginx request memory resources - memory: 50Mi - # -- WebSight Nginx request cpu resources cpu: 50m - limits: - # -- WebSight Nginx limits memory resources - memory: 100Mi - # -- WebSight Nginx limits cpu resources - cpu: 100m + memory: 50Mi livenessProbe: # -- enables WebSight Nginx pods liveness probe enabled: true @@ -147,17 +137,12 @@ mongo: value: mongoadmin - name: MONGO_INITDB_ROOT_USERNAME value: mongoadmin + # -- MongoDB resources settings resources: + # @ignored in generated docs requests: - # -- MongoDB request memory resources - memory: 1Gi - # -- MongoDB request cpu resources cpu: 500m - limits: - # -- MongoDB limits memory resources - memory: 4Gi - # -- MongoDB limits cpu resources - cpu: 1000m + memory: 1Gi livenessProbe: # -- enables MongoDB pods liveness probe enabled: true