diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml index afeef81..6fab77d 100644 --- a/charts/retool/Chart.yaml +++ b/charts/retool/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 6.2.16 +version: 6.3.0 maintainers: - name: Retool Engineering email: engineering+helm@retool.com diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index 47b4a9a..bb51064 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -179,7 +179,11 @@ spec: {{- end }} {{- end }} resources: +{{- if .Values.jobRunner.resources }} +{{ toYaml .Values.jobRunner.resources | indent 10 }} +{{- else }} {{ toYaml .Values.resources | indent 10 }} +{{- end }} {{- if regexMatch "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" .Values.image.tag }} {{- if semverCompare ">=2.110.0-0" .Values.image.tag }} livenessProbe: diff --git a/charts/retool/templates/deployment_workflows.yaml b/charts/retool/templates/deployment_workflows.yaml index bcfd553..2186583 100644 --- a/charts/retool/templates/deployment_workflows.yaml +++ b/charts/retool/templates/deployment_workflows.yaml @@ -252,7 +252,11 @@ spec: periodSeconds: {{ .Values.readinessProbe.periodSeconds }} {{- end }} resources: +{{- if .Values.workflows.backend.resources }} +{{ toYaml .Values.workflows.backend.resources | indent 10 }} +{{- else }} {{ toYaml .Values.resources | indent 10 }} +{{- end }} volumeMounts: {{- range $configFile := (keys .Values.files) }} - name: {{ template "retool.name" $ }} diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml index 7edb9b5..982c66f 100644 --- a/charts/retool/values.yaml +++ b/charts/retool/values.yaml @@ -238,7 +238,7 @@ extraVolumeMounts: [] extraVolumes: [] -# These resource specifications apply to the main backend and workflows backend pods. +# These resource specifications will apply to the main backend, jobs-runner, dbconnector, and workflows-backend pods unless container specific resources are set. resources: # If you have more than 1 replica, the minimum recommended resources configuration is as follows: # - cpu: 2048m @@ -306,6 +306,15 @@ jobRunner: # will already launch a job runner pod # enabled: true + # If necessary, specify the resources to provision the jobRunner pod separately from the main backend pods. + # resources: + # limits: + # cpu: 4096m + # memory: 8192Mi + # requests: + # cpu: 2048m + # memory: 4096Mi + # Annotations for job runner pods annotations: {} @@ -346,6 +355,15 @@ workflows: # will launch 9 pods -- 4 workflow backend, 1 workflow workers, and 4 for temporal cluster replicaCount: 1 + # If necessary, specify the resources to provision the workflows-backend pod separately from the main backend pods. + # resources: + # limits: + # cpu: 4096m + # memory: 8192Mi + # requests: + # cpu: 2048m + # memory: 4096Mi + # Timeout for queries, in ms. This will set the timeout for workflows-related pods only # If this value is not set but config.dbConnectorTimeout is, we will set workflows pod timeouts # to .Values.config.dbConnectorTimeout @@ -401,7 +419,7 @@ workflows: # Resources for the workflow worker only - these are sane inputs that bias towards stability # Can adjust but may see OOM errors if memory too low for heavy workflow load - # To make adjustments to workflows backend, use top level resources key. + # To make adjustments to workflows backend, use workflows.backend.resources key. resources: limits: cpu: 2000m diff --git a/values.yaml b/values.yaml index 7edb9b5..982c66f 100644 --- a/values.yaml +++ b/values.yaml @@ -238,7 +238,7 @@ extraVolumeMounts: [] extraVolumes: [] -# These resource specifications apply to the main backend and workflows backend pods. +# These resource specifications will apply to the main backend, jobs-runner, dbconnector, and workflows-backend pods unless container specific resources are set. resources: # If you have more than 1 replica, the minimum recommended resources configuration is as follows: # - cpu: 2048m @@ -306,6 +306,15 @@ jobRunner: # will already launch a job runner pod # enabled: true + # If necessary, specify the resources to provision the jobRunner pod separately from the main backend pods. + # resources: + # limits: + # cpu: 4096m + # memory: 8192Mi + # requests: + # cpu: 2048m + # memory: 4096Mi + # Annotations for job runner pods annotations: {} @@ -346,6 +355,15 @@ workflows: # will launch 9 pods -- 4 workflow backend, 1 workflow workers, and 4 for temporal cluster replicaCount: 1 + # If necessary, specify the resources to provision the workflows-backend pod separately from the main backend pods. + # resources: + # limits: + # cpu: 4096m + # memory: 8192Mi + # requests: + # cpu: 2048m + # memory: 4096Mi + # Timeout for queries, in ms. This will set the timeout for workflows-related pods only # If this value is not set but config.dbConnectorTimeout is, we will set workflows pod timeouts # to .Values.config.dbConnectorTimeout @@ -401,7 +419,7 @@ workflows: # Resources for the workflow worker only - these are sane inputs that bias towards stability # Can adjust but may see OOM errors if memory too low for heavy workflow load - # To make adjustments to workflows backend, use top level resources key. + # To make adjustments to workflows backend, use workflows.backend.resources key. resources: limits: cpu: 2000m