Revert "added filebeat to all components"

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>

3 files changed, 1 insertions, 50 deletions

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 13cf57093d..2048a694f2 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -95,10 +95,6 @@ spec:
           name: portal-root
         - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
           name: portal-logs
-        - mountPath: /var/log/onap
-          name: portal-logs2
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/logback.xml
-          name: portal-logback-be
         ports:
         - containerPort: 8005
         - containerPort: 8009
@@ -108,30 +104,10 @@ 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: portal-logs2
-        - mountPath: /usr/share/filebeat/data
-          name: portal-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
-        - name: filebeat-conf
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
-        - name: portal-logs2
-          emptyDir: {}
-        - name: portal-data-filebeat
-          emptyDir: {}
-        - name: portal-logback-be
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-be/logback.xml
         - name: portal-fusion-properties
           hostPath:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
@@ -167,7 +143,7 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
         - name: sdkapp-fusion-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties            
         - name: portal-mariadb-onboarding-sql
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index df38a2abb3..f4e46ab062 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -28,10 +28,6 @@ spec:
           readOnly: true
         - mountPath: /var/lib/mysql
           name: portal-mariadb-data
-        - mountPath: /var/log/onap
-          name: portal-logs
-        - mountPath: /tmp/logback.xml
-          name: portal-logback
         ports:
         - containerPort: 3306
           name: portaldb
@@ -40,16 +36,6 @@ spec:
             port: 3306
           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: portal-logs
-        - mountPath: /usr/share/filebeat/data
-          name: portal-data-filebeat
       volumes:
       - name: localtime
         hostPath:
@@ -57,15 +43,5 @@ spec:
       - name: portal-mariadb-data
         persistentVolumeClaim:
           claimName: portal-db
-      - name: filebeat-conf
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
-      - name: portal-logs
-        emptyDir: {}
-      - name: portal-data-filebeat
-        emptyDir: {}
-      - name: portal-logback
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 757995ab63..4a3cbd185d 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -9,6 +9,5 @@ image:
   portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
   ubuntuInit: oomk8s/ubuntu-init:1.0.0
   ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
-  filebeat: docker.elastic.co/beats/filebeat:5.5.0
 onapPortal:
   webappsDir: "/opt/apache-tomcat-8.0.37/webapps"