Merge pull request #17 from RonasIT/feat/worker-tolerations

Feat/worker tolerations
RonasIT · Jul 1, 2024 · 2c43ccf · 2c43ccf
2 parents ce97f8e + 1f4430e
commit 2c43ccf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git 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.4.0
 dependencies:
   - name: postgresql
     condition: postgresql.enabled

diff --git 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.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square)
 
 ## Installing the Chart
 

diff --git 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
@@ -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 }}