From 0822b8f930b7822e158e028fe68f94ec986d1bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sun, 10 Jul 2022 00:05:54 +0200
Subject: [PATCH] Allow for more flexible Strimzi configuration

---
 helm/templates/kafka/kafka-cluster.yaml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/helm/templates/kafka/kafka-cluster.yaml b/helm/templates/kafka/kafka-cluster.yaml
index f1a58077a..ee2bd0f1c 100644
--- a/helm/templates/kafka/kafka-cluster.yaml
+++ b/helm/templates/kafka/kafka-cluster.yaml
@@ -30,14 +30,9 @@ spec:
         configMapKeyRef:
           name: {{ template "theodolite.fullname" . }}-kafka-metrics
           key: kafka-metrics-config.yml
-    {{- with .Values.strimzi.kafka.nodeSelectorTerms}}
+    {{- with .Values.strimzi.kafka.template}}
     template:
-      pod:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-                {{- toYaml . | nindent 16 }}
+      {{- toYaml . | nindent 6 }}
     {{- end}}
     {{- with .Values.strimzi.kafka.resources}}
     resources:
@@ -52,14 +47,9 @@ spec:
     {{- end }}
     storage:
       type: ephemeral
-    {{- with .Values.strimzi.zookeeper.nodeSelectorTerms}}
+    {{- with .Values.strimzi.kafka.template}}
     template:
-      pod:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-                {{- toYaml . | nindent 16 }}
+      {{- toYaml . | nindent 6 }}
     {{- end}}
 
   kafkaExporter: {}
-- 
GitLab