You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by in...@apache.org on 2020/03/24 01:02:24 UTC
[skywalking-kubernetes] branch master updated: fix
https://github.com/apache/skywalking/issues/4512 (#41)
This is an automated email from the ASF dual-hosted git repository.
innerpeacez 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 e2cf8ef fix https://github.com/apache/skywalking/issues/4512 (#41)
e2cf8ef is described below
commit e2cf8ef371707dc54a4469573f80e4cec8d7906a
Author: vision-ken <cn...@qq.com>
AuthorDate: Tue Mar 24 09:02:17 2020 +0800
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 | 14 +++++++++++++-
chart/skywalking/templates/oap-deployment.yaml | 8 ++++++++
chart/skywalking/values-es6.yaml | 2 ++
chart/skywalking/values.yaml | 2 ++
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index c415902..7e3a01f 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/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 }}
diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
index a82f3e6..5f75524 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/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 }}
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 15467f8..e7647d6 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/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"
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 2d3a38a..883b97e 100644
--- a/chart/skywalking/values.yaml
+++ b/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"