fix lint failed. (#45)

* fix lint failed. * fix
apache · Mar 24, 2020 · 525b933 · 525b933
1 parent e2cf8ef
commit 525b933
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
@@ -55,6 +55,7 @@ spec:
   {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
 {{- end }}
+{{- if not .Values.elasticsearch.enabled }}
         {{- if .Values.elasticsearch.config.user }}
         - name: SW_ES_USER
           value: "{{ .Values.elasticsearch.config.user }}"
@@ -63,6 +64,7 @@ spec:
         - name: SW_ES_PASSWORD
           value: "{{ .Values.elasticsearch.config.password }}"
         {{- end }}
+{{- end }}
         {{- range $key, $value :=  .Values.oap.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}

diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
@@ -126,6 +126,7 @@ spec:
 {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
 {{- end }}
+{{- if not .Values.elasticsearch.enabled }}
         {{- if .Values.elasticsearch.config.user }}
         - name: SW_ES_USER
           value: "{{ .Values.elasticsearch.config.user }}"
@@ -134,6 +135,7 @@ spec:
         - name: SW_ES_PASSWORD
           value: "{{ .Values.elasticsearch.config.password }}"
         {{- end }}
+{{- end }}
         {{- range $key, $value :=  .Values.oap.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}

diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
@@ -100,12 +100,12 @@ ui:
 
 elasticsearch:
   enabled: true
-#  config:
-#    port:
-#      http: 9200
-#    host: elasticsearch # es service on kubernetes or host
-#    user: "xxx"
-#    password: "xxx"
+  config:               # For users of an existing elasticsearch cluster,takes effect when `elasticsearch.enabled` is false
+    port:
+      http: 9200
+    host: elasticsearch # es service on kubernetes or host
+    user: "xxx"         # [optional]
+    password: "xxx"     # [optional]
   clusterName: "elasticsearch"
   nodeGroup: "master"
 

diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
@@ -100,12 +100,12 @@ ui:
 
 elasticsearch:
   enabled: true
-#  config:
-#    port:
-#      http: 9200
-#    host: elasticsearch # es service on kubernetes or host
-#    user: "xxx"
-#    password: "xxx"
+  config:               # For users of an existing elasticsearch cluster,takes effect when `elasticsearch.enabled` is false
+    port:
+      http: 9200
+    host: elasticsearch # es service on kubernetes or host
+    user: "xxx"         # [optional]
+    password: "xxx"     # [optional]
   clusterName: "elasticsearch"
   nodeGroup: "master"