From fbe56489e316be69550c50c2f0d5489dd0df44b1 Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Thu, 29 May 2025 15:24:51 +0530 Subject: [PATCH 1/2] [INFRA-177] Plane-EE: Add resource requests for Plane Enterprise Helm Chart (#117) * Add memory and CPU request configurations for various services in Helm chart - Updated `questions.yml` to include `memoryRequest` and `cpuRequest` for services: web, space, admin, live, silo, monitor, api, worker, beatworker, and email_service. - Modified `values.yaml` to set default values for `memoryRequest` and `cpuRequest` for the aforementioned services. - Adjusted deployment templates to utilize the new request configurations for resource management. * Refactor email service resource configurations in Helm chart - Updated `questions.yml` to change variable names from `memory_limit` and `cpu_limit` to `memoryLimit` and `cpuLimit`. - Modified `values.yaml` to reflect the new variable names for memory and CPU limits and requests. - Adjusted `email.deployment.yaml` to utilize the updated variable names for resource requests and limits. * Refactor resource variable names in Helm chart - Updated `questions.yml` to change variable names from `memory_request`, `cpu_request`, `memory_limit`, and `cpu_limit` to `memoryRequest` and `cpuRequest`, `memoryLimit` and `cpuLimit`. - Modified `silo.deployment.yaml` to utilize the updated variable names for resource requests and limits. * Add memory and CPU request configurations for additional services in README.md - Updated the README.md to include `memoryRequest` and `cpuRequest` settings for services: web, space, admin, live, monitor, api, silo, worker, and beatworker. - Ensured consistency in documentation for resource management across all relevant services. * Update README.md to reflect new variable names for email service resource configurations - Changed variable names for memory and CPU limits and requests from `memory_limit`, `cpu_limit`, `memory_request`, and `cpu_request` to `memoryLimit`, `cpuLimit`, `memoryRequest`, and `cpuRequest` for the email service. - Ensured consistency with previous refactoring of resource variable names across the Helm chart. --- charts/plane-enterprise/Chart.yaml | 2 +- charts/plane-enterprise/README.md | 26 +++++- charts/plane-enterprise/questions.yml | 90 +++++++++++++++++-- .../templates/workloads/admin.deployment.yaml | 4 +- .../templates/workloads/api.deployment.yaml | 4 +- .../workloads/beat-worker.deployment.yaml | 4 +- .../templates/workloads/email.deployment.yaml | 8 +- .../templates/workloads/live.deployment.yaml | 4 +- .../templates/workloads/monitor.stateful.yaml | 4 +- .../templates/workloads/silo.deployment.yaml | 8 +- .../templates/workloads/space.deployment.yaml | 4 +- .../templates/workloads/web.deployment.yaml | 4 +- .../workloads/worker.deployment.yaml | 4 +- charts/plane-enterprise/values.yaml | 26 +++++- 14 files changed, 154 insertions(+), 38 deletions(-) diff --git a/charts/plane-enterprise/Chart.yaml b/charts/plane-enterprise/Chart.yaml index 3f039a49..f0f70fdb 100644 --- a/charts/plane-enterprise/Chart.yaml +++ b/charts/plane-enterprise/Chart.yaml @@ -5,7 +5,7 @@ description: Meet Plane. An Enterprise software development tool to manage issue type: application -version: 1.2.3 +version: 1.2.4 appVersion: "1.10.0" home: https://plane.so/ diff --git a/charts/plane-enterprise/README.md b/charts/plane-enterprise/README.md index 413d218f..e4960920 100644 --- a/charts/plane-enterprise/README.md +++ b/charts/plane-enterprise/README.md @@ -170,8 +170,10 @@ | Setting | Default | Required | Description | |---|:---:|:---:|---| | services.web.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | -| services.web.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| +| services.web.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.web.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.web.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.web.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.web.image| artifacts.plane.so/makeplane/web-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.web.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `web`. | | services.web.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -183,6 +185,8 @@ | services.space.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.space.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.space.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.space.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.space.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.space.image| artifacts.plane.so/makeplane/space-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.space.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `space`. | | services.space.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -194,6 +198,8 @@ | services.admin.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.admin.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.admin.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.admin.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.admin.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.admin.image| artifacts.plane.so/makeplane/admin-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.admin.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `admin`. | | services.admin.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -205,6 +211,8 @@ | services.live.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.live.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.live.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.live.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.live.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.live.image| artifacts.plane.so/makeplane/live-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.live.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `live`. | | env.live_sentry_dsn | | | (optional) Live service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry provided DSN for this integration.| @@ -219,6 +227,8 @@ |---|:---:|:---:|---| | services.monitor.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.monitor.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.monitor.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.monitor.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.monitor.image| artifacts.plane.so/makeplane/monitor-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.monitor.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `monitor`. | | services.monitor.volumeSize | 100Mi | | While setting up the stateful deployment, while creating the persistant volume, volume allocation size need to be provided. This key helps you set the volume allocation size. Unit of this value must be in Mi (megabyte) or Gi (gigabyte) | @@ -231,6 +241,8 @@ | services.api.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.api.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.api.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.api.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.api.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.api.image| artifacts.plane.so/makeplane/backend-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.api.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `api`. | | env.sentry_dsn | | | (optional) API service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry provided DSN for this integration.| @@ -245,6 +257,8 @@ | services.silo.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.silo.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.silo.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.silo.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.silo.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | services.silo.image| artifacts.plane.so/makeplane/silo-commercial | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | services.silo.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `silo`. | | services.silo.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -277,6 +291,8 @@ | services.worker.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.worker.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.worker.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.worker.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.worker.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| ### Beat-Worker deployment @@ -285,6 +301,8 @@ | services.beatworker.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | services.beatworker.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | services.beatworker.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| services.beatworker.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| services.beatworker.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| ### Email Service Deployment @@ -292,8 +310,10 @@ |---|:---:|:---:|---| | services.email_service.enabled | false | | Set to `true` to enable the email service deployment | | services.email_service.replicas | 1 | | Number of replicas for the email service deployment | -| services.email_service.memory_limit | 1000Mi | | Memory limit for the email service deployment | -| services.email_service.cpu_limit | 500m | | CPU limit for the email service deployment | +| services.email_service.memoryLimit | 1000Mi | | Memory limit for the email service deployment | +| services.email_service.cpuLimit | 500m | | CPU limit for the email service deployment | +| services.email_service.memoryRequest | 50Mi | | Memory request for the email service deployment | +| services.email_service.cpuRequest | 50m | | CPU request for the email service deployment | | services.email_service.image | artifacts.plane.so/makeplane/email-commercial | | Docker image for the email service deployment | | services.email_service.pullPolicy | Always | | Image pull policy for the email service deployment | | env.email_service_envs.smtp_domain | | Yes | The SMTP Domain to be used with email service | diff --git a/charts/plane-enterprise/questions.yml b/charts/plane-enterprise/questions.yml index 845a8d5e..2aeaff9b 100644 --- a/charts/plane-enterprise/questions.yml +++ b/charts/plane-enterprise/questions.yml @@ -102,6 +102,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.web.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.web.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.web.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -129,6 +137,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.space.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.space.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.space.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -156,6 +172,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.admin.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.admin.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.admin.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -183,6 +207,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.live.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.live.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.live.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -214,14 +246,22 @@ questions: label: "Default Replica Count" type: int default: 1 - - variable: services.silo.memory_limit + - variable: services.silo.memoryLimit label: "Memory Limit" type: string default: 1000Mi - - variable: services.silo.cpu_limit + - variable: services.silo.cpuLimit label: "CPU Limit" type: string default: 500m + - variable: services.silo.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.silo.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.silo.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -341,6 +381,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.monitor.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.monitor.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.monitor.volumeSize label: "Volume Size" type: string @@ -372,6 +420,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: services.api.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.api.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.api.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -412,7 +468,14 @@ questions: label: "CPU Limit" type: string default: 500m - + - variable: services.worker.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.worker.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.beatworker.replicas label: "Default Replica Count" type: int @@ -427,7 +490,14 @@ questions: label: "CPU Limit" type: string default: 500m - + - variable: services.beatworker.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.beatworker.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: services.email_service.enabled label: "Enable Email Service" type: boolean @@ -439,14 +509,22 @@ questions: label: "Default Replica Count" type: int default: 1 - - variable: services.email_service.memory_limit + - variable: services.email_service.memoryLimit label: "Memory Limit" type: string default: 1000Mi - - variable: services.email_service.cpu_limit + - variable: services.email_service.cpuLimit label: "CPU Limit" type: string default: 500m + - variable: services.email_service.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: services.email_service.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: env.email_service_envs.smtp_domain label: "SMTP Domain" type: string diff --git a/charts/plane-enterprise/templates/workloads/admin.deployment.yaml b/charts/plane-enterprise/templates/workloads/admin.deployment.yaml index 5fc61d9f..8c4c57d9 100644 --- a/charts/plane-enterprise/templates/workloads/admin.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/admin.deployment.yaml @@ -47,8 +47,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.admin.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.admin.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.admin.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.admin.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/api.deployment.yaml b/charts/plane-enterprise/templates/workloads/api.deployment.yaml index 451dd201..8831c0ac 100644 --- a/charts/plane-enterprise/templates/workloads/api.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/api.deployment.yaml @@ -47,8 +47,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.api.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.api.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.api.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.api.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml b/charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml index 3405c7ec..69fb9aac 100644 --- a/charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml @@ -24,8 +24,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.beatworker.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.beatworker.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.beatworker.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.beatworker.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/email.deployment.yaml b/charts/plane-enterprise/templates/workloads/email.deployment.yaml index 6db99ea1..8bcf3c03 100644 --- a/charts/plane-enterprise/templates/workloads/email.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/email.deployment.yaml @@ -66,11 +66,11 @@ spec: failureThreshold: 3 resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.email_service.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.email_service.cpuRequest | default "50m" | quote }} limits: - memory: {{ .Values.services.email_service.memory_limit | default "1000Mi" | quote }} - cpu: {{ .Values.services.email_service.cpu_limit | default "500m" | quote}} + memory: {{ .Values.services.email_service.memoryLimit | default "1000Mi" | quote }} + cpu: {{ .Values.services.email_service.cpuLimit | default "500m" | quote}} envFrom: - configMapRef: name: {{ .Release.Name }}-email-vars diff --git a/charts/plane-enterprise/templates/workloads/live.deployment.yaml b/charts/plane-enterprise/templates/workloads/live.deployment.yaml index 043e536c..c6084a83 100644 --- a/charts/plane-enterprise/templates/workloads/live.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/live.deployment.yaml @@ -47,8 +47,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.live.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.live.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.live.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.live.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/monitor.stateful.yaml b/charts/plane-enterprise/templates/workloads/monitor.stateful.yaml index 2467eba1..0dcc70f9 100644 --- a/charts/plane-enterprise/templates/workloads/monitor.stateful.yaml +++ b/charts/plane-enterprise/templates/workloads/monitor.stateful.yaml @@ -44,8 +44,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.monitor.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.monitor.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.monitor.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.monitor.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml index 0af1450e..3fcc3df5 100644 --- a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml @@ -70,11 +70,11 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.silo.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.silo.cpuRequest | default "50m" | quote }} limits: - memory: {{ .Values.services.silo.memory_limit | default "1000Mi" | quote }} - cpu: {{ .Values.services.silo.cpu_limit | default "500m" | quote}} + memory: {{ .Values.services.silo.memoryLimit | default "1000Mi" | quote }} + cpu: {{ .Values.services.silo.cpuLimit | default "500m" | quote}} command: - node args: diff --git a/charts/plane-enterprise/templates/workloads/space.deployment.yaml b/charts/plane-enterprise/templates/workloads/space.deployment.yaml index c77d2778..192ec7d5 100644 --- a/charts/plane-enterprise/templates/workloads/space.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/space.deployment.yaml @@ -47,8 +47,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.space.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.space.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.space.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.space.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/web.deployment.yaml b/charts/plane-enterprise/templates/workloads/web.deployment.yaml index 1026a0ca..2e97f329 100644 --- a/charts/plane-enterprise/templates/workloads/web.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/web.deployment.yaml @@ -47,8 +47,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.web.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.web.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.web.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.web.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/templates/workloads/worker.deployment.yaml b/charts/plane-enterprise/templates/workloads/worker.deployment.yaml index bc86828f..8853a9eb 100644 --- a/charts/plane-enterprise/templates/workloads/worker.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/worker.deployment.yaml @@ -24,8 +24,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.services.worker.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.services.worker.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.services.worker.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.services.worker.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-enterprise/values.yaml b/charts/plane-enterprise/values.yaml index 5c5f4b3d..77b8e3b9 100644 --- a/charts/plane-enterprise/values.yaml +++ b/charts/plane-enterprise/values.yaml @@ -72,6 +72,8 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/web-commercial pullPolicy: Always assign_cluster_ip: false @@ -79,6 +81,8 @@ services: monitor: memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/monitor-commercial pullPolicy: Always volumeSize: 100Mi @@ -88,6 +92,8 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/space-commercial pullPolicy: Always assign_cluster_ip: false @@ -96,6 +102,8 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/admin-commercial pullPolicy: Always assign_cluster_ip: false @@ -104,6 +112,8 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/live-commercial pullPolicy: Always assign_cluster_ip: false @@ -112,6 +122,8 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/backend-commercial pullPolicy: Always assign_cluster_ip: false @@ -120,17 +132,21 @@ services: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m - + memoryRequest: 50Mi + cpuRequest: 50m beatworker: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m - + memoryRequest: 50Mi + cpuRequest: 50m silo: enabled: true replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/silo-commercial pullPolicy: Always assign_cluster_ip: false @@ -154,8 +170,10 @@ services: email_service: enabled: false replicas: 1 - memory_limit: 1000Mi - cpu_limit: 500m + memoryLimit: 1000Mi + cpuLimit: 500m + memoryRequest: 50Mi + cpuRequest: 50m image: artifacts.plane.so/makeplane/email-commercial pullPolicy: Always From 5648ce8450ab8acb5d08c888e99ece057e7e2935 Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Thu, 29 May 2025 16:02:13 +0530 Subject: [PATCH 2/2] [INFRA-178] Plane-CE: Add resource requests for Plane CE Helm Chart (#116) * Add resource request configurations for various components in Helm chart - Updated `questions.yml` to include memory and CPU request variables for web, space, admin, live, api, worker, and beatworker components. - Modified `values.yaml` to set default memory and CPU requests for each component. - Adjusted deployment templates to utilize the new request configurations for memory and CPU. * Bump Plane version to 1.1.2 in Chart.yaml * Add memory and CPU request configurations to README.md - Included `memoryRequest` and `cpuRequest` parameters for web, space, admin, live, api, worker, and beatworker components in the documentation. - Updated descriptions to clarify the purpose of these new parameters in the context of Kubernetes deployments. * Fix resource limits in space deployment template - Updated memory and CPU limit configurations in `space.deployment.yaml` to reference the correct `space` values instead of `web` values, ensuring accurate resource allocation for the space component. * Update image reference in space deployment template - Changed the image reference in `space.deployment.yaml` to use `space.image` instead of `space.images`, ensuring consistency with the updated configuration structure. --- charts/plane-ce/Chart.yaml | 2 +- charts/plane-ce/README.md | 14 +++++ charts/plane-ce/questions.yml | 59 ++++++++++++++++++- .../templates/workloads/admin.deployment.yaml | 4 +- .../templates/workloads/api.deployment.yaml | 4 +- .../workloads/beat-worker.deployment.yaml | 4 +- .../templates/workloads/live.deployment.yaml | 4 +- .../templates/workloads/space.deployment.yaml | 10 ++-- .../templates/workloads/web.deployment.yaml | 4 +- .../workloads/worker.deployment.yaml | 4 +- charts/plane-ce/values.yaml | 14 +++++ 11 files changed, 102 insertions(+), 21 deletions(-) diff --git a/charts/plane-ce/Chart.yaml b/charts/plane-ce/Chart.yaml index f70e01a1..56eb93e8 100644 --- a/charts/plane-ce/Chart.yaml +++ b/charts/plane-ce/Chart.yaml @@ -5,7 +5,7 @@ description: Meet Plane. An open-source software development tool to manage issu type: application -version: 1.1.1 +version: 1.1.2 appVersion: "0.26.0" home: https://plane.so diff --git a/charts/plane-ce/README.md b/charts/plane-ce/README.md index 837b54a9..c09656ac 100644 --- a/charts/plane-ce/README.md +++ b/charts/plane-ce/README.md @@ -149,6 +149,8 @@ | web.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | web.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | web.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| web.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| web.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | web.image| artifacts.plane.so/makeplane/plane-frontend | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | web.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `web`. | | web.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -160,6 +162,8 @@ | space.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | space.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | space.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| space.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| space.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | space.image| artifacts.plane.so/makeplane/plane-space| | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | space.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `space`. | | space.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -171,6 +175,8 @@ | admin.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | admin.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | admin.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| admin.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| admin.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | admin.image| artifacts.plane.so/makeplane/plane-admin | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | admin.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `admin`. | | admin.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service | @@ -182,6 +188,8 @@ | live.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | live.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | live.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| live.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| live.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | live.image| artifacts.plane.so/makeplane/plane-live | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | live.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `live`. | | env.live_sentry_dsn | | | (optional) Live service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry provided DSN for this integration.| @@ -196,6 +204,8 @@ | api.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | api.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | api.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| api.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| api.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | api.image| artifacts.plane.so/makeplane/plane-backend | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | | api.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `api`. | | env.sentry_dsn | | | (optional) API service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry provided DSN for this integration.| @@ -210,6 +220,8 @@ | worker.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | worker.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | worker.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| worker.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| worker.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | worker.image| artifacts.plane.so/makeplane/plane-backend | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | ### Beat-Worker deployment @@ -219,6 +231,8 @@ | beatworker.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 | | beatworker.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.| | beatworker.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.| +| beatworker.memoryRequest | 50Mi | | Every deployment in kubernetes can be set to use minimum memory they are allowed to use. This key sets the memory request for this deployment to use.| +| beatworker.cpuRequest | 50m | | Every deployment in kubernetes can be set to use minimum cpu they are allowed to use. This key sets the cpu request for this deployment to use.| | beatworker.image| artifacts.plane.so/makeplane/plane-backend | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment | ### Ingress and SSL Setup diff --git a/charts/plane-ce/questions.yml b/charts/plane-ce/questions.yml index 4074f871..330d44a0 100644 --- a/charts/plane-ce/questions.yml +++ b/charts/plane-ce/questions.yml @@ -55,6 +55,14 @@ questions: label: "Assign Cluster IP" type: boolean default: false + - variable: web.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: web.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: space.image label: Space Docker Image @@ -83,6 +91,14 @@ questions: label: "CPU Limit" type: string default: 500m + - variable: space.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: space.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: space.assign_cluster_ip label: "Assign Cluster IP" type: boolean @@ -119,7 +135,14 @@ questions: label: "Assign Cluster IP" type: boolean default: true - + - variable: admin.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: admin.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: live.image label: Live Docker Image type: string @@ -152,6 +175,14 @@ questions: label: "Assign Cluster IP" type: boolean default: false + - variable: live.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: live.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: env.live_sentry_dsn label: "Live Sentry DSN" type: string @@ -197,6 +228,14 @@ questions: label: "Assign Cluster IP" type: boolean default: false + - variable: api.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: api.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: env.cors_allowed_origins label: "CORS Allowed Origins" type: string @@ -233,7 +272,14 @@ questions: label: "CPU Limit" type: string default: 500m - + - variable: worker.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: worker.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: beatworker.replicas label: "Default Replica Count" type: int @@ -248,7 +294,14 @@ questions: label: "CPU Limit" type: string default: 500m - + - variable: beatworker.memoryRequest + label: "Memory Request" + type: string + default: 50Mi + - variable: beatworker.cpuRequest + label: "CPU Request" + type: string + default: 50m - variable: redis.local_setup label: "Install Redis" type: boolean diff --git a/charts/plane-ce/templates/workloads/admin.deployment.yaml b/charts/plane-ce/templates/workloads/admin.deployment.yaml index be32eb64..01722d15 100644 --- a/charts/plane-ce/templates/workloads/admin.deployment.yaml +++ b/charts/plane-ce/templates/workloads/admin.deployment.yaml @@ -46,8 +46,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.admin.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.admin.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.admin.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.admin.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/templates/workloads/api.deployment.yaml b/charts/plane-ce/templates/workloads/api.deployment.yaml index 2da395df..0eb76c66 100644 --- a/charts/plane-ce/templates/workloads/api.deployment.yaml +++ b/charts/plane-ce/templates/workloads/api.deployment.yaml @@ -46,8 +46,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.api.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.api.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.api.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.api.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml b/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml index b827fc37..396d8b5d 100644 --- a/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml +++ b/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml @@ -24,8 +24,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.beatworker.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.beatworker.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.beatworker.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.beatworker.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/templates/workloads/live.deployment.yaml b/charts/plane-ce/templates/workloads/live.deployment.yaml index 659b14c5..a86f263b 100644 --- a/charts/plane-ce/templates/workloads/live.deployment.yaml +++ b/charts/plane-ce/templates/workloads/live.deployment.yaml @@ -46,8 +46,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.live.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.live.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.live.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.live.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/templates/workloads/space.deployment.yaml b/charts/plane-ce/templates/workloads/space.deployment.yaml index 192fd3f5..4f5bc217 100644 --- a/charts/plane-ce/templates/workloads/space.deployment.yaml +++ b/charts/plane-ce/templates/workloads/space.deployment.yaml @@ -41,16 +41,16 @@ spec: containers: - name: {{ .Release.Name }}-space imagePullPolicy: {{ .Values.space.pullPolicy | default "Always" }} - image: {{ .Values.space.images | default "artifacts.plane.so/makeplane/plane-space" }}:{{ .Values.planeVersion }} + image: {{ .Values.space.image | default "artifacts.plane.so/makeplane/plane-space" }}:{{ .Values.planeVersion }} stdin: true tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.space.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.space.cpuRequest | default "50m" | quote }} limits: - memory: {{ .Values.web.memoryLimit | default "1000Mi" | quote }} - cpu: {{ .Values.web.cpuLimit | default "500m" | quote}} + memory: {{ .Values.space.memoryLimit | default "1000Mi" | quote }} + cpu: {{ .Values.space.cpuLimit | default "500m" | quote}} command: - node args: diff --git a/charts/plane-ce/templates/workloads/web.deployment.yaml b/charts/plane-ce/templates/workloads/web.deployment.yaml index e4fa7c4c..1b302ead 100644 --- a/charts/plane-ce/templates/workloads/web.deployment.yaml +++ b/charts/plane-ce/templates/workloads/web.deployment.yaml @@ -46,8 +46,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.web.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.web.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.web.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.web.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/templates/workloads/worker.deployment.yaml b/charts/plane-ce/templates/workloads/worker.deployment.yaml index 956ccdb4..5d462012 100644 --- a/charts/plane-ce/templates/workloads/worker.deployment.yaml +++ b/charts/plane-ce/templates/workloads/worker.deployment.yaml @@ -24,8 +24,8 @@ spec: tty: true resources: requests: - memory: "50Mi" - cpu: "50m" + memory: {{ .Values.worker.memoryRequest | default "50Mi" | quote }} + cpu: {{ .Values.worker.cpuRequest | default "50m" | quote }} limits: memory: {{ .Values.worker.memoryLimit | default "1000Mi" | quote }} cpu: {{ .Values.worker.cpuLimit | default "500m" | quote}} diff --git a/charts/plane-ce/values.yaml b/charts/plane-ce/values.yaml index 422d2d2d..b35bc8a1 100644 --- a/charts/plane-ce/values.yaml +++ b/charts/plane-ce/values.yaml @@ -73,6 +73,8 @@ web: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-frontend pullPolicy: Always assign_cluster_ip: false @@ -81,6 +83,8 @@ space: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-space pullPolicy: Always assign_cluster_ip: false @@ -89,6 +93,8 @@ admin: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-admin pullPolicy: Always assign_cluster_ip: false @@ -97,6 +103,8 @@ live: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-live pullPolicy: Always assign_cluster_ip: false @@ -105,6 +113,8 @@ api: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-backend pullPolicy: Always assign_cluster_ip: false @@ -113,6 +123,8 @@ worker: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-backend pullPolicy: Always @@ -120,6 +132,8 @@ beatworker: replicas: 1 memoryLimit: 1000Mi cpuLimit: 500m + cpuRequest: 50m + memoryRequest: 50Mi image: artifacts.plane.so/makeplane/plane-backend pullPolicy: Always