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/appc/templates/appc-deployment.yaml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'kubernetes/appc/templates') diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index b192c30fbf..661980b296 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -46,7 +46,7 @@ spec: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties + value: /opt/openecomp/appc/data/properties - name: APPC_CONFIG_DIR value: /opt/openecomp/appc/data/properties - name: DMAAP_TOPIC_ENV @@ -66,10 +66,6 @@ spec: name: sdnc-aaiclient-properties - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json name: sdnc-admportal-json - - mountPath: /var/log/onap - name: appc-logs - - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg - name: appc-log-config ports: - containerPort: 8181 - containerPort: 1830 @@ -78,30 +74,10 @@ 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: appc-logs - - mountPath: /usr/share/filebeat/data - name: appc-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml - - name: appc-log-config - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/appc/org.ops4j.pax.logging.cfg - - name: appc-logs - emptyDir: {} - - name: appc-data-filebeat - emptyDir: {} - name: appc-properties hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties -- cgit 1.2.3-korg