feat: Apply tolerations and nodeSelector to pods in the chart (#45)

* Apply tolerations and nodeSelector to pod specs * version bump to 0.7.6
chatwoot · Feb 4, 2022 · b374634 · b374634
1 parent 8cc9448
commit b374634
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/charts/chatwoot/Chart.yaml b/charts/chatwoot/Chart.yaml
@@ -31,7 +31,7 @@ sources:
   - http://www.chatwoot.com
 
 # This is the chart version.
-version: 0.7.5
+version: 0.7.6
 
 # This is the application version.
 appVersion: "v2.1.1"
diff --git a/charts/chatwoot/templates/migrations-job.yaml b/charts/chatwoot/templates/migrations-job.yaml
@@ -17,6 +17,13 @@ spec:
   template:
     spec:
       restartPolicy: Never
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
       initContainers:
       - name: init-postgres
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/charts/chatwoot/templates/tests/test-connection.yaml b/charts/chatwoot/templates/tests/test-connection.yaml
@@ -11,6 +11,13 @@ metadata:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": hook-succeeded  
 spec:
+  {{- with .Values.tolerations }}
+  tolerations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.nodeSelector }}
+  nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 4 }}
+  {{- end }}
   containers:
     - name: wget
       image: busybox

diff --git a/charts/chatwoot/templates/web-deployment.yaml b/charts/chatwoot/templates/web-deployment.yaml
@@ -24,6 +24,13 @@ spec:
         release: "{{ .Release.Name }}"
         role: web
     spec:
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
       containers:
         - args: 
             - bundle

diff --git a/charts/chatwoot/templates/worker-deployment.yaml b/charts/chatwoot/templates/worker-deployment.yaml
@@ -24,6 +24,13 @@ spec:
         release: "{{ .Release.Name }}"
         role: worker
     spec:
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
       containers:
         - args:
             - bundle