diff options
| author |   Maciej Wereski <m.wereski@partner.samsung.com> | 2021-11-05 14:38:18 +0000 |
|---|---|---|
| committer | Maciej Wereski <m.wereski@partner.samsung.com> | 2021-11-08 17:58:35 +0100 |
| commit | df9ba227fe15004086769f919f0d060f1a7f2687 (patch) | |
| tree | 7616641d79153f7c0cc1f3deea390fc49da03528 /kubernetes/so/components/so-oof-adapter | |
| parent | d5ae6db805736529090f08955e5a9730e0cdadb3 (diff) | |
[SO] Use log template
Ability to turn off filebeat is needed as it is being deprecated. To
achieve that existing log helper template is used.
Issue-ID: OOM-1
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
Change-Id: Ib883fcafe4424d4ec78a999899c99af2ae95a6cc
Diffstat (limited to 'kubernetes/so/components/so-oof-adapter')
| -rwxr-xr-x | kubernetes/so/components/so-oof-adapter/templates/deployment.yaml | 20 | ||||
| -rwxr-xr-x | kubernetes/so/components/so-oof-adapter/values.yaml | 5 |
2 files changed, 7 insertions, 18 deletions
diff --git a/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml b/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml index 5e8869ce11..f5307992d1 100755 --- a/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml @@ -70,19 +70,7 @@ spec: {{ include "so.helpers.livenessProbe" .| indent 8 }} ports: {{- include "common.containerPorts" . | nindent 12 }} # 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: logs - mountPath: /var/log/onap/so - - name: {{ include "common.fullname" . }}-logs - mountPath: /var/log/onap + {{ include "common.log.sidecar" . | nindent 6 }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}} volumes: {{ include "so.certificate.volumes" . | nindent 6 }} - name: logs @@ -93,11 +81,7 @@ spec: - name: {{ include "common.fullname" . }}-log-conf configMap: name: {{ include "common.fullname" . }}-log - - name: {{ include "common.fullname" . }}-filebeat-conf - configMap: - name: {{ .Release.Name }}-so-filebeat-configmap - - name: {{ include "common.fullname" . }}-data-filebeat - emptyDir: {} + {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }} - name: {{ include "common.fullname" . }}-logs emptyDir: {} imagePullSecrets: diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml index 240f05f204..863e0e9428 100755 --- a/kubernetes/so/components/so-oof-adapter/values.yaml +++ b/kubernetes/so/components/so-oof-adapter/values.yaml @@ -145,3 +145,8 @@ serviceAccount: nameOverride: so-oof-adapter roles: - read + +#Log configuration +log: + path: /var/log/onap +logConfigMapNamePrefix: '{{ include "common.fullname" . }}' |