From 9075b5c9f242fcc978efebe44b4a4aa0178aafc7 Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Thu, 4 Nov 2021 14:01:26 +0000 Subject: [DMAAP] Use log template Ability to turn off filebeat is needed as it is being deprecated. To achieve that existing log helper template is used. Also unecessary filebeat config map was removed. Issue-ID: OOM-1 Signed-off-by: Maciej Wereski Change-Id: I3dc384b0e2e857637897ac56a172a605de7eb67e --- .../components/dmaap-dr-prov/templates/deployment.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml') diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml index a3051eee5d..5f99ea3399 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml @@ -107,17 +107,7 @@ spec: {{ toYaml .Values.affinity | indent 10 }} {{- end }} # Filebeat sidecar container - - name: {{ include "common.name" . }}-filebeat-onap - image: {{ include "repositoryGenerator.image.logging" . }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - name: {{ include "common.fullname" . }}-filebeat-conf - mountPath: /usr/share/filebeat/filebeat.yml - subPath: filebeat.yml - - name: {{ include "common.fullname" . }}-data-filebeat - mountPath: /usr/share/filebeat/data - - name: {{ include "common.fullname" . }}-logs - mountPath: /var/log/onap/datarouter-prov + {{ include "common.log.sidecar" . | nindent 8 }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}} volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }} - name: localtime @@ -132,11 +122,7 @@ spec: - name: {{ include "common.fullname" . }}-log-conf configMap: name: {{ include "common.fullname" . }}-log - - name: {{ include "common.fullname" . }}-filebeat-conf - configMap: - name: {{ include "common.fullname" . }}-dmaap-dr-prov-filebeat-configmap - - name: {{ include "common.fullname" . }}-data-filebeat - emptyDir: {} + {{ include "common.log.volumes" . | nindent 6 }} - name: {{ include "common.fullname" . }}-logs emptyDir: {} imagePullSecrets: -- cgit 1.2.3-korg