From 943a2080b78edbb8963ae09d360fc190fb76e8d1 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 14 Aug 2020 23:02:30 +0100
Subject: [PATCH] More logging fixes

---
 charts/kubezero-logging/templates/elasticsearch.yaml | 7 +++----
 charts/kubezero-logging/values.yaml                  | 6 +-----
 deploy/templates/values.yaml                         | 3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/charts/kubezero-logging/templates/elasticsearch.yaml b/charts/kubezero-logging/templates/elasticsearch.yaml
index f99ba51f..5798c5e5 100644
--- a/charts/kubezero-logging/templates/elasticsearch.yaml
+++ b/charts/kubezero-logging/templates/elasticsearch.yaml
@@ -56,10 +56,9 @@ spec:
         affinity:
           podAntiAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
+            - labelSelector:
+                matchLabels:
+                  elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
               topologyKey: kubernetes.io/hostname
           {{- if .zone }}
           nodeAffinity:
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index b4d00bb8..6d6ae9a5 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -1,8 +1,4 @@
-# Default values for zdt-logging.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# This is for backwards compatibility with older zdt-logging setup
+# use this for backwards compatability
 # fullnameOverride: ""
 
 # Version for ElasticSearch and Kibana have to match so we define it at top-level
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 8fa5a96f..600df345 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -129,6 +129,9 @@ kubezero:
   logging:
     enabled: {{ .Values.logging.enabled }}
     values:
+      {{- with .Values.logging }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
 
 argo-cd:
   {{- with index .Values "argo-cd" "server" }}