More logging fixes

charts/kubezero-logging/templates/elasticsearch.yaml

@@ -56,10 +56,9 @@ spec:
         affinity:
           podAntiAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
+            - labelSelector:
-                labelSelector:
+                matchLabels:
-                  matchLabels:
+                  elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
-                    elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
               topologyKey: kubernetes.io/hostname
           {{- if .zone }}
           nodeAffinity:

charts/kubezero-logging/values.yaml

@@ -1,8 +1,4 @@
-# Default values for zdt-logging.
+# use this for backwards compatability
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# This is for backwards compatibility with older zdt-logging setup
 # fullnameOverride: ""
 
 # Version for ElasticSearch and Kibana have to match so we define it at top-level

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" }}