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/policy/templates/dep-drools.yaml | 28 ------------------------ kubernetes/policy/templates/dep-pap.yaml | 33 ----------------------------- kubernetes/policy/templates/dep-pdp.yaml | 28 ------------------------ 3 files changed, 89 deletions(-) (limited to 'kubernetes/policy/templates') diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index b789f5a565..9c3fc29d99 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -71,38 +71,10 @@ spec: name: drools - mountPath: /usr/share/maven/conf/settings.xml name: drools-settingsxml - - mountPath: /var/log/onap - name: policy-logs - - mountPath: /tmp/logback.xml - name: policy-logback - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/config/logback.xml"] - - 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: policy-logs - - mountPath: /usr/share/filebeat/data - name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: policy-logs - emptyDir: {} - - name: policy-data-filebeat - emptyDir: {} - - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/drools/logback.xml - name: drools-settingsxml hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index 0ee1b12d3c..794c6548b8 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -86,43 +86,10 @@ spec: readOnly: true - mountPath: /tmp/policy-install/config/ name: pe - - mountPath: /var/log/onap - name: policy-logs - - mountPath: /tmp/policy-install/logback.xml - name: policy-sdk-logback - - mountPath: /tmp/logback.xml - name: policy-logback - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/servers/pap/webapps/pap/WEB-INF/classes/logback.xml;cp -f /tmp/policy-install/logback.xml /opt/app/policy/servers/console/webapps/ecomp/WEB-INF/classes/logback.xml"] - - 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: policy-logs - - mountPath: /usr/share/filebeat/data - name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: policy-logs - emptyDir: {} - - name: policy-data-filebeat - emptyDir: {} - - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pap-rest/logback.xml - - name: policy-sdk-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/ep_sdk_app/logback.xml - name: pe hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index 6ba2a335ae..d7d697d71d 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -65,38 +65,10 @@ spec: readOnly: true - mountPath: /tmp/policy-install/config name: pe - - mountPath: /var/log/onap - name: policy-logs - - mountPath: /tmp/logback.xml - name: policy-logback - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/servers/pdp/webapps/pdp/WEB-INF/classes/logback.xml"] - - 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: policy-logs - - mountPath: /usr/share/filebeat/data - name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: policy-logs - emptyDir: {} - - name: policy-data-filebeat - emptyDir: {} - - name: policy-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pdp-rest/logback.xml - name: pe hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ -- cgit 1.2.3-korg