From 397de93b72c6afe3ace5674cc64421c2b360af6a Mon Sep 17 00:00:00 2001
From: incubator4 <aries0robin@gmail.com>
Date: Fri, 30 Aug 2024 17:39:13 +0800
Subject: [PATCH] feat(node): add tolerations

---
 charts/node/Chart.yaml                            | 4 ++--
 charts/node/templates/broadcaster/deployment.yaml | 2 +-
 charts/node/templates/core/deployment.yaml        | 2 +-
 charts/node/templates/worker/deployment.yaml      | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/node/Chart.yaml b/charts/node/Chart.yaml
index 7a96dbe..9418451 100644
--- a/charts/node/Chart.yaml
+++ b/charts/node/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 0.5.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.0.0"
+appVersion: "v1.0.2"
 
 dependencies:
   - name: rsshub
diff --git a/charts/node/templates/broadcaster/deployment.yaml b/charts/node/templates/broadcaster/deployment.yaml
index 36f5791..a6544d5 100644
--- a/charts/node/templates/broadcaster/deployment.yaml
+++ b/charts/node/templates/broadcaster/deployment.yaml
@@ -68,7 +68,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.broadcaster.tolerations }}
+      {{- with (mergeOverwrite (deepCopy .Values.global.tolerations) .Values.broadcaster.tolerations) }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/node/templates/core/deployment.yaml b/charts/node/templates/core/deployment.yaml
index 21dd6a6..085b8f1 100644
--- a/charts/node/templates/core/deployment.yaml
+++ b/charts/node/templates/core/deployment.yaml
@@ -87,7 +87,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.core.tolerations }}
+      {{- with (mergeOverwrite (deepCopy .Values.global.tolerations) .Values.core.tolerations) }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/node/templates/worker/deployment.yaml b/charts/node/templates/worker/deployment.yaml
index 94396ed..1765b82 100644
--- a/charts/node/templates/worker/deployment.yaml
+++ b/charts/node/templates/worker/deployment.yaml
@@ -76,4 +76,8 @@ spec:
           configMap:
             name: {{ include "node.fullname" $ }}
             defaultMode: 0644
+      {{- with .Values.global.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
\ No newline at end of file