From fda4349a6db037747876b8da1de97ec52026bbec Mon Sep 17 00:00:00 2001
From: Aleksei Kiyashkin <akiyashkin@ronasit.com>
Date: Thu, 27 Jun 2024 16:37:56 +0000
Subject: [PATCH 1/3] fix: add tolerations to cronjobs and workers

---
 charts/laravel/templates/cronjobs.yaml           | 12 ++++++++++--
 charts/laravel/templates/workers-deployment.yaml | 10 +++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/charts/laravel/templates/cronjobs.yaml b/charts/laravel/templates/cronjobs.yaml
index 5f18ae4..4e66626 100644
--- a/charts/laravel/templates/cronjobs.yaml
+++ b/charts/laravel/templates/cronjobs.yaml
@@ -41,7 +41,7 @@ spec:
               {{- toYaml $root.Values.volumeMounts | nindent 14 }}
             {{- end }}
             resources:
-{{ toYaml ( .resources | default $root.Values.cronjobs.resources ) | indent 16 }}
+              {{ toYaml ( .resources | default $root.Values.cronjobs.resources ) | indent 16 }}
             command:
               - sh
               - -c
@@ -51,7 +51,15 @@ spec:
             {{- toYaml $root.Values.volumes | nindent 12 }}
           {{- end }}
           nodeSelector:
-            {{- toYaml $root.Values.nodeSelector | nindent 12 }}
+            {{- toYaml (.nodeSelector | default $root.Values.cronjobs.nodeSelector | default $root.Values.nodeSelector) | nindent 12 }}
+          {{- with .affinity | default $root.Values.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .tolerations | default $root.Values.cronjobs.tolerations | default $root.Values.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           restartPolicy: "{{ .restartPolicy | default $root.Values.cronjobs.restartPolicy }}"
 {{- end }}
 {{- end }}
diff --git a/charts/laravel/templates/workers-deployment.yaml b/charts/laravel/templates/workers-deployment.yaml
index 9f3ca3d..5f882c8 100644
--- a/charts/laravel/templates/workers-deployment.yaml
+++ b/charts/laravel/templates/workers-deployment.yaml
@@ -39,7 +39,7 @@ spec:
           {{- toYaml $root.Values.volumeMounts | nindent 10 }}
         {{- end }}
         resources:
-{{ toYaml ( .resources | default $root.Values.workers.resources ) | indent 10 }}
+          {{ toYaml ( .resources | default $root.Values.workers.resources ) | indent 10 }}
         command: 
           - sh
           - -c
@@ -50,5 +50,13 @@ spec:
       {{- end }}
       nodeSelector:
         {{- toYaml (.nodeSelector | default $root.Values.workers.nodeSelector | default $root.Values.nodeSelector) | nindent 8 }}
+      {{- with .affinity | default $root.Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .tolerations | default $root.Values.workers.tolerations | default $root.Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
 {{- end }}

From ef3015f85da79ad70e85f138d48aa86c38de9a69 Mon Sep 17 00:00:00 2001
From: Aleksei Kiyashkin <akiyashkin@ronasit.com>
Date: Thu, 27 Jun 2024 16:53:24 +0000
Subject: [PATCH 2/3] chore: update chart version and run helm-docs

---
 charts/laravel/Chart.yaml | 2 +-
 charts/laravel/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/laravel/Chart.yaml b/charts/laravel/Chart.yaml
index 2e6a299..612b49f 100644
--- a/charts/laravel/Chart.yaml
+++ b/charts/laravel/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.16.0
 description: A Helm chart for Kubernetes to deploy Laravel applications
 name: laravel
 type: application
-version: 2.3.2
+version: 2.3.3
 dependencies:
   - name: postgresql
     condition: postgresql.enabled
diff --git a/charts/laravel/README.md b/charts/laravel/README.md
index 62afe19..60fd82c 100644
--- a/charts/laravel/README.md
+++ b/charts/laravel/README.md
@@ -1,6 +1,6 @@
 # laravel
 
-![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square)
+![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square)
 
 ## Installing the Chart
 

From 1f4430e196569cfa95890089cfc0ac85ad449bb5 Mon Sep 17 00:00:00 2001
From: Aleksei Kiyashkin <akiyashkin@ronasit.com>
Date: Mon, 1 Jul 2024 07:47:33 +0000
Subject: [PATCH 3/3] fix: update chart version and run helm-docs

---
 charts/laravel/Chart.yaml | 2 +-
 charts/laravel/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/laravel/Chart.yaml b/charts/laravel/Chart.yaml
index 612b49f..93eecd4 100644
--- a/charts/laravel/Chart.yaml
+++ b/charts/laravel/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.16.0
 description: A Helm chart for Kubernetes to deploy Laravel applications
 name: laravel
 type: application
-version: 2.3.3
+version: 2.4.0
 dependencies:
   - name: postgresql
     condition: postgresql.enabled
diff --git a/charts/laravel/README.md b/charts/laravel/README.md
index 60fd82c..9b9405a 100644
--- a/charts/laravel/README.md
+++ b/charts/laravel/README.md
@@ -1,6 +1,6 @@
 # laravel
 
-![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square)
+![Version: 2.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square)
 
 ## Installing the Chart