fix https://github.com/apache/skywalking/issues/4512 (#41)

* fix https://github.com/apache/skywalking/issues/4512

* give tips in the values.yaml file.

* put es account config under the elasticsearch.config.xx

* determine whether these two keys exist

* add tips

chart/skywalking/templates/es-init.job.yaml

@@ -54,4 +54,16 @@ spec:
           value: "{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
   {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
-{{- end }}
\ No newline at end of file
+{{- end }}
+        {{- if .Values.elasticsearch.config.user }}
+        - name: SW_ES_USER
+          value: "{{ .Values.elasticsearch.config.user }}"
+        {{- end }}
+        {{- if .Values.elasticsearch.config.password }}
+        - name: SW_ES_PASSWORD
+          value: "{{ .Values.elasticsearch.config.password }}"
+        {{- end }}
+        {{- range $key, $value :=  .Values.oap.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}

chart/skywalking/templates/oap-deployment.yaml

@@ -126,6 +126,14 @@ spec:
 {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
 {{- end }}
+        {{- if .Values.elasticsearch.config.user }}
+        - name: SW_ES_USER
+          value: "{{ .Values.elasticsearch.config.user }}"
+        {{- end }}
+        {{- if .Values.elasticsearch.config.password }}
+        - name: SW_ES_PASSWORD
+          value: "{{ .Values.elasticsearch.config.password }}"
+        {{- end }}
         {{- range $key, $value :=  .Values.oap.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}

chart/skywalking/values-es6.yaml

@@ -104,6 +104,8 @@ elasticsearch:
 #    port:
 #      http: 9200
 #    host: elasticsearch # es service on kubernetes or host
+#    user: "xxx"
+#    password: "xxx"
   clusterName: "elasticsearch"
   nodeGroup: "master"
 

chart/skywalking/values.yaml

@@ -104,6 +104,8 @@ elasticsearch:
 #    port:
 #      http: 9200
 #    host: elasticsearch # es service on kubernetes or host
+#    user: "xxx"
+#    password: "xxx"
   clusterName: "elasticsearch"
   nodeGroup: "master"