From ac38e76f4ebfaecdf7ecf9722288eb63968c0828 Mon Sep 17 00:00:00 2001
From: Echoz <chris@echoz.io>
Date: Thu, 25 Jul 2024 08:09:33 +0200
Subject: [PATCH] fix: don't use global affinity value in tolerations (#42)

---
 templates/bulker/deployment.yaml      | 2 +-
 templates/event-log-init/job.yaml     | 2 +-
 templates/event-log-trim/cronjob.yaml | 2 +-
 templates/migration/job.yaml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/bulker/deployment.yaml b/templates/bulker/deployment.yaml
index ddc900c..03f5507 100644
--- a/templates/bulker/deployment.yaml
+++ b/templates/bulker/deployment.yaml
@@ -136,7 +136,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with (.Values.bulker.tolerations | default .Values.global.affinity) }}
+      {{- with (.Values.bulker.tolerations | default .Values.global.tolerations) }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/templates/event-log-init/job.yaml b/templates/event-log-init/job.yaml
index 6c42004..b26556c 100644
--- a/templates/event-log-init/job.yaml
+++ b/templates/event-log-init/job.yaml
@@ -102,7 +102,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with (.Values.eventLogInit.tolerations | default .Values.global.affinity) }}
+      {{- with (.Values.eventLogInit.tolerations | default .Values.global.tolerations) }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/templates/event-log-trim/cronjob.yaml b/templates/event-log-trim/cronjob.yaml
index 1012636..2e6c271 100644
--- a/templates/event-log-trim/cronjob.yaml
+++ b/templates/event-log-trim/cronjob.yaml
@@ -105,7 +105,7 @@ spec:
           affinity:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- with (.Values.eventLogTrim.tolerations | default .Values.global.affinity) }}
+          {{- with (.Values.eventLogTrim.tolerations | default .Values.global.tolerations) }}
           tolerations:
             {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/templates/migration/job.yaml b/templates/migration/job.yaml
index 1a542dd..535297e 100644
--- a/templates/migration/job.yaml
+++ b/templates/migration/job.yaml
@@ -84,7 +84,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with (.Values.migration.tolerations | default .Values.global.affinity) }}
+      {{- with (.Values.migration.tolerations | default .Values.global.tolerations) }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}