From ee61350526faeb4c6f0c0fad814ae3ae724972dc Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 2 Aug 2024 14:37:35 -0700
Subject: [PATCH 01/17] add jobsrunner resources and change
 deployment_jobs.yaml to accept resources if set

---
 charts/retool/templates/deployment_jobs.yaml |  4 ++++
 charts/retool/values.yaml                    | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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/values.yaml b/charts/retool/values.yaml
index 7edb9b5..172bdab 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -306,6 +306,15 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
+  # These resource specifications apply specific to the jobs runner pod. Set the resources to scale jobs runner pod separately from main backend pods.
+  # resources:
+  #   limits:
+  #     cpu: 4096m
+  #     memory: 8192Mi
+  #   requests:
+  #     cpu: 2048m
+  #     memory: 4096Mi
+
   # Annotations for job runner pods
   annotations: {}
 
@@ -648,6 +657,7 @@ hostAliases: {}
 #     - anothertest.com
 
 telemetry:
+
   # When enabled, will collect metrics and logs from the other pods in the
   # chart. These will be forwarded to Retool for proactive monitoring and bug
   # identification when `telemetry.sendToRetool.enabled = true`, and can also
@@ -656,6 +666,7 @@ telemetry:
   enabled: false
 
   sendToRetool:
+
     # Only relevant when `telemetry.enabled = true`. When enabled, telemetry
     # from pods in this chart will be forwarded to Retool for proactive
     # monitoring and bug identification.
@@ -665,12 +676,13 @@ telemetry:
     address: "https://telemetry.retool.com:443"
 
   image:
+
     repository: "tryretool/telemetry"
 
     # Default to same as top level `image.tag`.
     tag: null
 
-    pullPolicy: "IfNotPresent"
+    pullPolicy: 'IfNotPresent'
 
   resources:
     requests:

From eef65757ba6eafe19869cdfccab45d7564390c07 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Mon, 5 Aug 2024 11:38:23 -0700
Subject: [PATCH 02/17] jobsrunner.resources comment didnt make it to github-
 edit comment

---
 charts/retool/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 172bdab..482a1a3 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -306,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource specifications apply specific to the jobs runner pod. Set the resources to scale jobs runner pod separately from main backend pods.
+  # These resource specifications apply specific to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m

From d398fcb8c759f9768c55a81e93d125c7b40363e9 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Mon, 5 Aug 2024 11:49:13 -0700
Subject: [PATCH 03/17] added change to values.yaml file on base of directory

---
 values.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/values.yaml b/values.yaml
index 7edb9b5..60fd556 100644
--- a/values.yaml
+++ b/values.yaml
@@ -306,6 +306,15 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
+  # These resource specifications apply specific to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # resources:
+  #   limits:
+  #     cpu: 4096m
+  #     memory: 8192Mi
+  #   requests:
+  #     cpu: 2048m
+  #     memory: 4096Mi
+  
   # Annotations for job runner pods
   annotations: {}
 

From c2747692b75bfc84cd310459627a0e0dffcd1a7d Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Mon, 5 Aug 2024 11:51:49 -0700
Subject: [PATCH 04/17] update comment

---
 charts/retool/values.yaml | 2 +-
 values.yaml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 482a1a3..bf8acf5 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -306,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource specifications apply specific to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # These resource apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m
diff --git a/values.yaml b/values.yaml
index 60fd556..f802750 100644
--- a/values.yaml
+++ b/values.yaml
@@ -306,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource specifications apply specific to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # These resource specifications apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m
@@ -314,7 +314,7 @@ jobRunner:
   #   requests:
   #     cpu: 2048m
   #     memory: 4096Mi
-  
+
   # Annotations for job runner pods
   annotations: {}
 

From 8f62193dfcdb84eddaf60651f87ff496c267458c Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 13 Sep 2024 16:18:07 -0700
Subject: [PATCH 05/17] removed extra spaces

---
 charts/retool/values.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index bf8acf5..15830da 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -657,7 +657,6 @@ hostAliases: {}
 #     - anothertest.com
 
 telemetry:
-
   # When enabled, will collect metrics and logs from the other pods in the
   # chart. These will be forwarded to Retool for proactive monitoring and bug
   # identification when `telemetry.sendToRetool.enabled = true`, and can also
@@ -666,7 +665,6 @@ telemetry:
   enabled: false
 
   sendToRetool:
-
     # Only relevant when `telemetry.enabled = true`. When enabled, telemetry
     # from pods in this chart will be forwarded to Retool for proactive
     # monitoring and bug identification.
@@ -676,13 +674,12 @@ telemetry:
     address: "https://telemetry.retool.com:443"
 
   image:
-
     repository: "tryretool/telemetry"
 
     # Default to same as top level `image.tag`.
     tag: null
 
-    pullPolicy: 'IfNotPresent'
+    pullPolicy: "IfNotPresent"
 
   resources:
     requests:

From c835fc0d257c8415e6e164fb82b22968bc1464e2 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 13 Sep 2024 16:45:52 -0700
Subject: [PATCH 06/17] fix linting issue: mid version & matching values.yaml

---
 charts/retool/values.yaml | 2 +-
 values.yaml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 15830da..c5a1ed8 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, db-connector, and workflows backend pods(unless if container specific resources are set)
 resources:
   # If you have more than 1 replica, the minimum recommended resources configuration is as follows:
   # - cpu: 2048m
diff --git a/values.yaml b/values.yaml
index f802750..f1ae39e 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 apply to the main backend, jobs-runner, db-connector, and workflows backend pods(unless if container specific resources are set)
 resources:
   # If you have more than 1 replica, the minimum recommended resources configuration is as follows:
   # - cpu: 2048m
@@ -306,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource specifications apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # These resource apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m

From 0e138c33b2924150477a63553a8257d90c149677 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 13 Sep 2024 16:47:40 -0700
Subject: [PATCH 07/17] fix linting issue with comment wording

---
 values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values.yaml b/values.yaml
index f1ae39e..c5a1ed8 100644
--- a/values.yaml
+++ b/values.yaml
@@ -238,7 +238,7 @@ extraVolumeMounts: []
 
 extraVolumes: []
 
-# These resource specifications apply to the main backend, jobs-runner, db-connector, and workflows backend pods(unless if container specific resources are set)
+# These resource specifications will apply to the main backend, jobs-runner, db-connector, and workflows backend pods(unless if container specific resources are set)
 resources:
   # If you have more than 1 replica, the minimum recommended resources configuration is as follows:
   # - cpu: 2048m

From e7bb543d2a40ddb8435e1700f39c36b32fa1fe24 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 13 Sep 2024 16:50:40 -0700
Subject: [PATCH 08/17] changing version

---
 charts/retool/Chart.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index afeef81..b32a949 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,7 +2,11 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
+<<<<<<< HEAD
 version: 6.2.16
+=======
+version: 6.3.0
+>>>>>>> c457c9d (changing version)
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com

From 64cf1b2b7e531352e5ef5f56423e81044e1ff39b Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Mon, 16 Sep 2024 11:01:31 -0700
Subject: [PATCH 09/17] PR review - change nit wording

---
 charts/retool/values.yaml | 4 ++--
 values.yaml               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index c5a1ed8..8107d9f 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -238,7 +238,7 @@ extraVolumeMounts: []
 
 extraVolumes: []
 
-# These resource specifications will apply to the main backend, jobs-runner, db-connector, and workflows backend pods(unless if container specific resources are set)
+# 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,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # If necessary, specify the resources to provision the jobRunner pod separately from the main backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m
diff --git a/values.yaml b/values.yaml
index c5a1ed8..8107d9f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -238,7 +238,7 @@ extraVolumeMounts: []
 
 extraVolumes: []
 
-# These resource specifications will apply to the main backend, jobs-runner, db-connector, and workflows backend pods(unless if container specific resources are set)
+# 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,7 +306,7 @@ jobRunner:
   # will already launch a job runner pod
   # enabled: true
 
-  # These resource apply only to the jobs-runner pod. Set the resources to scale jobs-runner pod separately from main-backend pods.
+  # If necessary, specify the resources to provision the jobRunner pod separately from the main backend pods.
   # resources:
   #   limits:
   #     cpu: 4096m

From 90cbfd6892c9f9bb6f28e8f66a89291afee911b8 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 13:47:47 -0700
Subject: [PATCH 10/17] include separation of wf-backend resources from
 main-backend

---
 charts/retool/templates/deployment_workflows.yaml | 4 ++++
 charts/retool/values.yaml                         | 9 +++++++++
 2 files changed, 13 insertions(+)

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 8107d9f..bd3e10f 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -355,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

From 770076f24612b96414a87b468589ab1d5a8e56e2 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 13:54:33 -0700
Subject: [PATCH 11/17] edit spacing

---
 charts/retool/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index bd3e10f..54ecfac 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -355,7 +355,7 @@ 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.
+    # If necessary, specify the resources to provision the workflows-backend pod separately from the main backend pods.
     # resources:
     #   limits:
     #     cpu: 4096m

From 7df7128abbdd344d5e803371362f4151a175f833 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 16:02:33 -0700
Subject: [PATCH 12/17] add wf backend resource values

---
 values.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/values.yaml b/values.yaml
index 8107d9f..5761c9b 100644
--- a/values.yaml
+++ b/values.yaml
@@ -354,6 +354,15 @@ workflows:
     # Scaling this number will increase the number of workflow backends, e.g. a replicaCount of 4
     # 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

From 3a64a2efc8609bbe23d2b7389a9b0aabf7c50027 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 16:32:59 -0700
Subject: [PATCH 13/17] pulled and removed space

---
 charts/retool/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 54ecfac..cfcbb42 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -363,7 +363,7 @@ workflows:
     #   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

From 2c32436bee53924dab7e53a0bbe9b5c8fa232dde Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 16:36:36 -0700
Subject: [PATCH 14/17] remove extra spaces

---
 values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values.yaml b/values.yaml
index 5761c9b..cfcbb42 100644
--- a/values.yaml
+++ b/values.yaml
@@ -354,7 +354,7 @@ workflows:
     # Scaling this number will increase the number of workflow backends, e.g. a replicaCount of 4
     # 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:

From 41d9f6efa9cde5fd3e236ea31888d42e991eb22a Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 17:14:28 -0700
Subject: [PATCH 15/17] change comment on workflows worker

---
 charts/retool/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index cfcbb42..982c66f 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -419,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

From 34cb20865bbf513b8bd42f196223e122702f9d10 Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Fri, 18 Oct 2024 17:14:57 -0700
Subject: [PATCH 16/17] change wording

---
 values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values.yaml b/values.yaml
index cfcbb42..982c66f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -419,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

From 97b471b8bc2c0ed348edea6599d49e6882c0db5c Mon Sep 17 00:00:00 2001
From: Kenny Cheng <kcheng16@gmail.com>
Date: Mon, 16 Dec 2024 16:09:51 -0800
Subject: [PATCH 17/17] change version to 6.3.0

---
 charts/retool/Chart.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index b32a949..6fab77d 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,11 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-<<<<<<< HEAD
-version: 6.2.16
-=======
 version: 6.3.0
->>>>>>> c457c9d (changing version)
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com