summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/templates/framework-deployment.yaml
diff options
context:
space:
mode:
authorliangke <lokyse@163.com>2018-01-30 18:39:25 +0800
committerliangke <lokyse@163.com>2018-03-05 18:01:53 +0800
commit2817f440d2b55a0f0e16376a0b73236f21237cdc (patch)
treea2fdbfece0dca77dbca07b209f8a4f6067b499bb /kubernetes/multicloud/templates/framework-deployment.yaml
parent8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (diff)
Sidecar filebeat container and ConfigMap
Add filebeat agent to ships logs to logging system. Apply ConfigMap to manager filebeat and log configuration. Change-Id: I02511b698c66d718d010df144f9dc27a6a52c2c6 Issue-ID: MULTICLOUD-151 Issue-ID: LOG-137 Signed-off-by: liangke <lokyse@163.com>
Diffstat (limited to 'kubernetes/multicloud/templates/framework-deployment.yaml')
-rw-r--r--kubernetes/multicloud/templates/framework-deployment.yaml34
1 files changed, 27 insertions, 7 deletions
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index dcdf0a2d75..f0c886506f 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -14,7 +14,6 @@ spec:
app: framework
name: multicloud-framework
spec:
- hostname: framework
containers:
- env:
- name: MSB_ADDR
@@ -31,12 +30,15 @@ spec:
value: "AAI"
- name: AAI_PASSWORD
value: "AAI"
+ image: {{ .Values.image.framework }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: framework
volumeMounts:
- - mountPath: /service/multivimbroker/logs
+ - mountPath: /var/log/onap
name: framework-log
- image: {{ .Values.image.framework }}
- imagePullPolicy: {{ .Values.pullPolicy }}
+ - mountPath: /opt/multivimbroker/multivimbroker/pub/config/log.yml
+ name: framework-logconfig
+ subPath: log.yml
ports:
- containerPort: 9001
livenessProbe:
@@ -49,11 +51,29 @@ spec:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 5
- restartPolicy: Always
+ - image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ subPath: filebeat.yml
+ - mountPath: /var/log/onap
+ name: framework-log
+ - mountPath: /usr/share/filebeat/data
+ name: framework-data-filebeat
volumes:
- name: framework-log
- hostPath:
- path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/framework/logs
+ emptyDir: {}
+ - name: framework-data-filebeat
+ emptyDir: {}
+ - name: filebeat-conf
+ configMap:
+ name: multicloud-filebeat-configmap
+ - name: framework-logconfig
+ configMap:
+ name: multicloud-framework-log-configmap
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+ restartPolicy: Always
#{{ end }}