From 22ebef515806c4c1b5e3cd6b275ba42a5cde34c7 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Tue, 1 Dec 2020 11:21:23 +0100
Subject: [PATCH] Fix nodeSelector related issues
---
execution/helm/theodolite-chart/templates/kafka-client.yaml | 2 +-
execution/helm/theodolite-chart/templates/prometheus.yaml | 4 ++++
.../helm/theodolite-chart/templates/zookeeper-client.yaml | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/execution/helm/theodolite-chart/templates/kafka-client.yaml b/execution/helm/theodolite-chart/templates/kafka-client.yaml
index f0dc09432..5f0ec7303 100644
--- a/execution/helm/theodolite-chart/templates/kafka-client.yaml
+++ b/execution/helm/theodolite-chart/templates/kafka-client.yaml
@@ -11,7 +11,7 @@ spec:
- sh
- -c
- "exec tail -f /dev/null"
- {{- with .Values.nodeSelector }}
+ {{- with .Values.kafkaClient.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
diff --git a/execution/helm/theodolite-chart/templates/prometheus.yaml b/execution/helm/theodolite-chart/templates/prometheus.yaml
index d44fcae91..0642ab6ac 100644
--- a/execution/helm/theodolite-chart/templates/prometheus.yaml
+++ b/execution/helm/theodolite-chart/templates/prometheus.yaml
@@ -14,4 +14,8 @@ spec:
memory: 400Mi
#scrapeInterval: 1s
enableAdminAPI: true
+ {{- with .Values.prometheus.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end}}
{{- end}}
\ No newline at end of file
diff --git a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
index 995703c12..8d246aef6 100644
--- a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
+++ b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ZookeeperClient.enabled -}}
+{{- if .Values.zookeeperClient.enabled -}}
apiVersion: v1
kind: Pod
metadata:
@@ -11,7 +11,7 @@ spec:
- sh
- -c
- "exec tail -f /dev/null"
- {{- with .Values.nodeSelector }}
+ {{- with .Values.zookeeperClient.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
--
GitLab