aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
diff options
context:
space:
mode:
authorLi Zi <li.zi30@zte.com.cn>2018-08-06 09:26:27 +0000
committerLi Zi <li.zi30@zte.com.cn>2018-08-07 02:42:48 +0000
commitc5290dc05be5ca1987d0a794769229e55e8e1126 (patch)
treed49d18491d23be20c6668de1961a11168939621b /kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
parentf2895bdfbff1a7c40dd7c247dcefcc19d43dcde0 (diff)
Fix the issue can't get log of msb in kibana
Issue-ID: MSB-267 Change-Id: Ie6bebdd7b8dde8cfd87c2ddcedc8f2831f9d98dd Signed-off-by: LiZi <li.zi30@zte.com.cn>
Diffstat (limited to 'kubernetes/msb/charts/msb-discovery/templates/deployment.yaml')
-rw-r--r--kubernetes/msb/charts/msb-discovery/templates/deployment.yaml34
1 files changed, 23 insertions, 11 deletions
diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
index 967e0e9bb7..81006a567d 100644
--- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
name: localtime
readOnly: true
- mountPath: /usr/local/discover-works/logs
- name: msb-discovery-logs
+ name: {{ include "common.fullname" . }}-logs
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -73,22 +73,34 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- # side car containers
- - name: filebeat-onap
+ # Filebeat sidecar container
+ - name: {{ include "common.name" . }}-filebeat-onap
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- - mountPath: /var/log/onap
- name: msb-discovery-logs
- - mountPath: /usr/share/filebeat/data
- name: msb-discovery-filebeat
+ - name: {{ include "common.fullname" . }}-filebeat-conf
+ mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
+ - name: {{ include "common.fullname" . }}-data-filebeat
+ mountPath: /usr/share/filebeat/data
+ - name: {{ include "common.fullname" . }}-logs
+ mountPath: /var/log/onap/msb/msb-discovery
+ - mountPath: /opt/ajsc/etc/config/logback.xml
+ name: {{ include "common.fullname" . }}-log-conf
+ subPath: logback.xml
volumes:
+ - name: {{ include "common.fullname" . }}-log-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-log
+ - name: {{ include "common.fullname" . }}-filebeat-conf
+ configMap:
+ name: {{ .Release.Name }}-msb-filebeat-configmap
+ - name: {{ include "common.fullname" . }}-data-filebeat
+ emptyDir: {}
+ - name: {{ include "common.fullname" . }}-logs
+ emptyDir: {}
- name: localtime
hostPath:
path: /etc/localtime
- - name: msb-discovery-logs
- emptyDir: {}
- - name: msb-discovery-filebeat
- emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"