From 91c77102cdc57ea5936789cacef6ad3e276b6054 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 26 Sep 2017 10:29:32 -0400
Subject: Revert "added filebeat to all components"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pods aren't starting properly. Let's not take any risk, so reverting.

   3m        18s        4    kubelet, kubernetes-5    spec.containers{vid-server}            Normal        Killing            Killing container with id docker://vid-server:FailedPostStartHook

This reverts commit 4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0.

Deployment of: filebeat containar for each relevant component Issue-ID:OOM-110
Change-Id: I7953ac3b0e2a4ecbdd1a7d2a48cb9a1964bf08ab
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../vid/templates/vid-server-deployment.yaml       | 29 ----------------------
 1 file changed, 29 deletions(-)

(limited to 'kubernetes/vid/templates/vid-server-deployment.yaml')

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 8226f54f0c..69c0b57ae1 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -86,15 +86,6 @@ spec:
         image: {{ .Values.image.vid }} 
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vid-server
-        volumeMounts:
-        - mountPath: /var/log/onap
-          name: vid-logs
-        - mountPath: /tmp/logback.xml
-          name: vid-logback
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /usr/local/tomcat/webapps/vid/WEB-INF/classes/logback.xml"]
         ports:
         - containerPort: 8080
         volumeMounts:
@@ -106,29 +97,9 @@ spec:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
-      - image: {{ .Values.image.filebeat }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: filebeat-onap
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          name: filebeat-conf
-        - mountPath: /var/log/onap
-          name: vid-logs
-        - mountPath: /usr/share/filebeat/data
-          name: vid-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
-        - name: filebeat-conf
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
-        - name: vid-logs
-          emptyDir: {}
-        - name: vid-data-filebeat
-          emptyDir: {}
-        - name: vid-logback
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-- 
cgit 1.2.3-korg