From d87e8b869b03cf85dcebc3d817f64d265b9ba98d Mon Sep 17 00:00:00 2001
From: LiZi <li.zi30@zte.com.cn>
Date: Wed, 14 Mar 2018 22:07:08 -0400
Subject: Add a filebeat container together with esr-server

With this modification, the log of esr-server will be in filebeat.

Change-Id: I647fc665ed383b58c14a34d6598e41cd6842b1ec
Issue-ID: AAI-756
Signed-off-by: LiZi <li.zi30@zte.com.cn>
---
 .../esr/templates/esr-esrserver-deployment.yaml    | 34 +++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'kubernetes/esr/templates/esr-esrserver-deployment.yaml')

diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
index 386d4014e4..a591a7e04c 100644
--- a/kubernetes/esr/templates/esr-esrserver-deployment.yaml
+++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
@@ -17,12 +17,18 @@ spec:
       name: esr-esrserver
     spec:
       containers:
-      - image: {{ .Values.esrserver.image }}
+      - name: esr-esrserver
+        image: {{ .Values.esrserver.image }}
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: esr-esrserver
         env:
         - name: MSB_ADDR
           value: {{ tpl .Values.msbaddr . }}
+        volumeMounts:
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
+        - mountPath: /home/esr/works/logs
+          name: esr-server-logs
         ports:
         - containerPort: {{ .Values.esrserver.port }}
         readinessProbe:
@@ -30,6 +36,26 @@ spec:
             port: {{ .Values.esrserver.port }}
           initialDelaySeconds: 5
           periodSeconds: 10
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+      - name: filebeat-onap-esr-server
+        image: {{ .Values.filebeat.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
+          name: filebeat-conf
+        - mountPath: /home/esr/works/logs
+          name: esr-server-logs
+        - mountPath: /usr/share/filebeat/data
+          name: esr-server-filebeat
+      volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
+      - name: filebeat-conf
+        configMap:
+          name: esr-filebeat-configmap
+      - name: esr-server-logs
+        emptyDir: {}
+      - name: esr-server-filebeat
+        emptyDir: {}
 #{{ end }}
-- 
cgit 1.2.3-korg