More logging fixes

This commit is contained in:
Stefan Reimer 2020-08-14 23:02:30 +01:00
parent bbab7de883
commit 943a2080b7
3 changed files with 7 additions and 9 deletions

View File

@ -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:

View File

@ -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

View File

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