ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

More logging fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/kubezero-logging/templates/elasticsearch.yaml
View File

@ -56,8 +56,7 @@ spec:
affinity: affinity:
podAntiAffinity: podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution: 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 topologyKey: kubernetes.io/hostname

6
charts/kubezero-logging/values.yaml
View File

@ -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: "" # fullnameOverride: ""
# Version for ElasticSearch and Kibana have to match so we define it at top-level # Version for ElasticSearch and Kibana have to match so we define it at top-level

3
deploy/templates/values.yaml
View File

@ -129,6 +129,9 @@ kubezero:
logging: logging:
enabled: {{ .Values.logging.enabled }} enabled: {{ .Values.logging.enabled }}
values: values:
{{- with .Values.logging }}
{{- toYaml . | nindent 6 }}
{{- end }}
argo-cd: argo-cd:
{{- with index .Values "argo-cd" "server" }} {{- with index .Values "argo-cd" "server" }}