[skywalking-kubernetes] branch master updated: fix lint failed. (#45)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new 525b933  fix lint failed. (#45)
525b933 is described below

commit 525b9333b77e2d50c13a7cd3f6c0881d4cfbd75c
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Mar 24 09:46:25 2020 +0800

    fix lint failed. (#45)
    
    * fix lint failed.
    
    * fix
---
 chart/skywalking/templates/es-init.job.yaml    |  2 ++
 chart/skywalking/templates/oap-deployment.yaml |  2 ++
 chart/skywalking/values-es6.yaml               | 12 ++++++------
 chart/skywalking/values.yaml                   | 12 ++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index 7e3a01f..c690a67 100644
--- 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
index 5f75524..505873d 100644
--- 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
index e7647d6..7356ebe 100644
--- 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
index 883b97e..5e8870e 100644
--- 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"