aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc/components/vfc-generic-vnfm-driver
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2021-11-18 16:28:05 +0100
committerMaciej Wereski <m.wereski@partner.samsung.com>2021-11-18 16:28:05 +0100
commit857687aa25213492e813616b4ebca5f3bd7eac85 (patch)
tree23a394b295c536e406f40a9f1c547a06c9a4dd23 /kubernetes/vfc/components/vfc-generic-vnfm-driver
parent4eb609904c7882b95ff1122b911bbe42feaaee21 (diff)
[VFC] 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: Ib3389c8e2f9221683862d3482c82f73f7f637441
Diffstat (limited to 'kubernetes/vfc/components/vfc-generic-vnfm-driver')
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml5
2 files changed, 8 insertions, 19 deletions
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
index c910f4786f..d5a043d533 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: "{{ .Values.log.path }}"
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/gvnfmdriver/config/log.yml
subPath: log.yml
@@ -85,18 +85,7 @@ spec:
{{- end }}
# side car containers
- - 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" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -106,11 +95,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index dcdcef82ba..d92989dbcb 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -85,3 +85,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'