diff options
| author |   Yang Xu <yang.xu@futurewei.com> | 2019-07-10 20:52:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-10 20:52:26 +0000 |
| commit | 5e6170cfb2f027e56e6935ef2059900976271a3d (patch) | |
| tree | 58dbe7cd1839045da713d988c33cade4c10d58e4 /kubernetes | |
| parent | 1b9848822827bcf68f5573ab2b664b8c73ef0f7b (diff) | |
| parent | e02c223fee98dabf6aa37b3a75e04dae34247a65 (diff) | |
Merge "Introduce postinstall configuration onboarding for Kibana pod (part 1 of 2)."
Diffstat (limited to 'kubernetes')
4 files changed, 23 insertions, 0 deletions
diff --git a/kubernetes/log/charts/log-kibana/resources/config/README.txt b/kubernetes/log/charts/log-kibana/resources/config/README.txt new file mode 100644 index 0000000000..2863c1d5e5 --- /dev/null +++ b/kubernetes/log/charts/log-kibana/resources/config/README.txt @@ -0,0 +1 @@ +"kibana-onboarding.json" file contains initial setup of Kibana obtained using Elasticdump tool.
\ No newline at end of file diff --git a/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml index ac52f62fde..657dca41a8 100644 --- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml +++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml @@ -46,6 +46,22 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness + - args: + - --input=/config/kibana-onboarding.json + - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.elasticdumpRepository }}/{{ .Values.elasticdumpImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-elasticdump + volumeMounts: + - mountPath: /config/kibana-onboarding.json + name: {{ include "common.fullname" . }} + subPath: kibana-onboarding.json containers: - name: {{ include "common.name" . }} image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}" @@ -90,5 +106,7 @@ spec: items: - key: kibana.yml path: kibana.yml + - key: kibana-onboarding.json + path: kibana-onboarding.json imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml index 8a56151c38..5132768206 100644 --- a/kubernetes/log/charts/log-kibana/values.yaml +++ b/kubernetes/log/charts/log-kibana/values.yaml @@ -26,6 +26,10 @@ global: # Application configuration defaults. ################################################################# +# Elasticdump image +elasticdumpRepository: docker.io +elasticdumpImage: taskrabbit/elasticsearch-dump + # BusyBox image busyboxRepository: registry.hub.docker.com busyboxImage: library/busybox:latest |