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-15 14:25:07 +01:00
parent 4d5a6b72d1
commit 58658bbc01
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-logging/templates/secrets.yaml
View File

@ -11,4 +11,4 @@ metadata:
{{ include "kubezero-lib.labels" . | indent 4 }} {{ include "kubezero-lib.labels" . | indent 4 }}
data: data:
username: {{ "elastic" | b64enc | quote }} username: {{ "elastic" | b64enc | quote }}
elastic: {{ .Values.es.elastic_password | b64enc | quote }} elastic: {{ .Values.elastic_password | b64enc | quote }}

3
charts/kubezero-logging/values-test.yaml
View File

@ -8,6 +8,8 @@ fullnameOverride: logging
# 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
version: 7.6.0 version: 7.6.0
elastic_password: "dsfsfs" # super_secret_elastic_password
es: es:
nodeSets: nodeSets:
- name: default-zone-0 - name: default-zone-0
@ -19,7 +21,6 @@ es:
s3Snapshot: s3Snapshot:
enabled: true enabled: true
iamrole: "dfsf" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots iamrole: "dfsf" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
elastic_password: "dsfsfs" # super_secret_elastic_password
prometheus: true prometheus: true

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

@ -4,6 +4,8 @@
# 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
version: 7.8.1 version: 7.8.1
elastic_password: "" # super_secret_elastic_password
es: es:
nodeSets: [] nodeSets: []
#- count: 2 #- count: 2
@ -14,7 +16,6 @@ es:
s3Snapshot: s3Snapshot:
enabled: false enabled: false
iamrole: "" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots iamrole: "" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
elastic_password: "" # super_secret_elastic_password
prometheus: false prometheus: false

24
deploy/templates/values.yaml
View File

@ -129,8 +129,28 @@ kubezero:
logging: logging:
enabled: {{ .Values.logging.enabled }} enabled: {{ .Values.logging.enabled }}
values: values:
{{- with .Values.logging }} elastic_password: {{ .Values.logging.elastic_password }}
{{- toYaml . | nindent 6 }}
{{- if .Values.logging.version }}
version: {{ .Values.logging.version }}
{{- if .Values.logging.fullnameOverride }}
{{- end }}
fullnameOverride: {{ .Values.logging.fullnameOverride }}
{{- end }}
es:
{{- if .Values.logging.es.nodeSets }}
nodeSets:
{{- with .Values.logging.es.nodeSets }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
prometheus: {{ .Values.metrics.enabled }}
{{- if .Values.logging.kibana }}
kibana:
{{- with .Values.logging.kibana }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }} {{- end }}
argo-cd: argo-cd: