Revert ES fixes as servicemonitor is retarted

2020-08-26 23:02:47 +01:00 · 2020-08-26 23:02:47 +01:00 · 7f540d57db
parent ea3432445e
commit 7f540d57db
2 changed files with 4 additions and 1 deletions
--- a/charts/kubezero-logging/templates/eck/secrets.yaml
+++ b/charts/kubezero-logging/templates/eck/secrets.yaml
@ -12,4 +12,5 @@ metadata:
 {{ include "kubezero-lib.labels" . | indent 4 }}
 data:
  elastic: {{ .Values.elastic_password | b64enc | quote }}
+  username: {{ "elastic" | b64enc | quote }}
 {{- end }}
--- a/charts/kubezero-logging/templates/eck/servicemonitor.yaml
+++ b/charts/kubezero-logging/templates/eck/servicemonitor.yaml
@ -10,7 +10,9 @@ metadata:
 spec:
  endpoints:
  - basicAuth:
-      username: elastic
+      username:
+        name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-user
+        key: username
      password:
        name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-user
        key: elastic