From 91c77102cdc57ea5936789cacef6ad3e276b6054 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët 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 --- kubernetes/sdc/templates/sdc-be.yaml | 24 ------------------------ kubernetes/sdc/templates/sdc-fe.yaml | 26 -------------------------- 2 files changed, 50 deletions(-) (limited to 'kubernetes/sdc/templates') diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 29f029f9ed..77c7545f6b 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -84,10 +84,6 @@ spec: readOnly: true - mountPath: /var/lib/jetty/logs name: sdc-logs - - mountPath: /var/log/onap - name: sdc-logs-2 - - mountPath: /var/lib/jetty/config/catalog-be/logback.xml - name: sdc-logback ports: - containerPort: 8443 - containerPort: 8080 @@ -96,27 +92,7 @@ spec: port: 8443 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: sdc-logs-2 - - mountPath: /usr/share/filebeat/data - name: sdc-data-filebeat volumes: - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: sdc-logs-2 - emptyDir: {} - - name: sdc-data-filebeat - emptyDir: {} - - name: sdc-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/be/logback.xml - name: sdc-sdc-es-es hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index 1a89889607..0ca83ae164 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -70,12 +70,6 @@ spec: name: sdc-logs - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb name: sdc-fe-config - - mountPath: /tmp/logback.xml - name: sdc-logback - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /var/lib/jetty/config/catalog-fe/logback.xml"] ports: - containerPort: 9443 - containerPort: 8181 @@ -84,27 +78,7 @@ spec: port: 8181 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: sdc-logs-2 - - mountPath: /usr/share/filebeat/data - name: sdc-data-filebeat volumes: - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: sdc-logs-2 - emptyDir: {} - - name: sdc-data-filebeat - emptyDir: {} - - name: sdc-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/fe/logback.xml - name: sdc-sdc-es-es hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES -- cgit 1.2.3-korg