From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 9 Nov 2021 12:53:09 +0000 (+0000)
Subject: Merge "[SDNC] Use log template"
X-Git-Tag: 9.0.0~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=892b4ca9a4d558d43da0fbfe731bfe6ea412ec1d;hp=-c;p=oom.git

Merge "[SDNC] Use log template"
---

892b4ca9a4d558d43da0fbfe731bfe6ea412ec1d
diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 6b97882dd6,5d179e4c81..06b864961f
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -141,8 -141,8 +141,8 @@@ spec
          - {{ include "common.fullname" . }}-dbinit-job
          {{ end -}}
          {{ if .Values.config.sdnr.enabled -}}
 -        - --container-name
 -        - {{ include "common.name" . }}-sdnrdb-init-job
 +        - --job-name
 +        - {{ include "common.fullname" . }}-sdnrdb-init-job
          {{ end -}}
          env:
          - name: NAMESPACE
@@@ -352,7 -352,7 +352,7 @@@
              subPath: blueprints-processor-adaptor.properties
            - mountPath: {{ .Values.persistence.mdsalPath }}
              name: {{ include "common.fullname" . }}-data
-           - mountPath: /var/log/onap
+           - mountPath: {{ .Values.log.path }}
              name: logs
            - mountPath: {{ .Values.config.odl.salConfigDir }}/{{ .Values.config.odl.salConfigVersion}}/sal-clustering-config-{{ .Values.config.odl.salConfigVersion}}-akkaconf.xml
              name: properties
@@@ -382,17 -382,7 +382,7 @@@
            {{ end }}
            resources: {{ include "common.resources" . | nindent 12 }}
          # side car containers
-         - name: filebeat-onap
-           image: {{ include "repositoryGenerator.image.logging" . }}
-           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-           volumeMounts:
-           - mountPath: /usr/share/filebeat/filebeat.yml
-             name: filebeat-conf
-             subPath: filebeat.yml
-           - mountPath: /var/log/onap
-             name: logs
-           - mountPath: /usr/share/filebeat/data
-             name: data-filebeat
+         {{ include "common.log.sidecar" . | nindent 8 }}
        {{- if .Values.nodeSelector }}
        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
        {{- end }}
@@@ -408,11 -398,7 +398,7 @@@
              path: /etc/localtime
          - name: logs
            emptyDir: {}
-         - name: data-filebeat
-           emptyDir: {}
-         - name: filebeat-conf
-           configMap:
-             name: {{ include "common.fullname" . }}-filebeat-configmap
+         {{ include "common.log.volumes" . | nindent 8 }}
          - name: sdnc-logging-cfg-config
            configMap:
              name: {{ include "common.fullname" . }}-log-configmap