summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-11-09 15:18:04 +0000
committerGerrit Code Review <gerrit@onap.org>2021-11-09 15:18:04 +0000
commit8e67e73081c7ca3b7a0236c8f6cd291f18f69de7 (patch)
treeae8bd2dde559899bcb6264dbec40191612250fdf /kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
parent59ea23af7c260be6f705bc4300cdab2953792e1e (diff)
parent771ec2ae646dceacdb256024a67a375c0ce1e818 (diff)
Merge "[SDC] Use log template"
Diffstat (limited to 'kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml')
-rw-r--r--kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml27
1 files changed, 3 insertions, 24 deletions
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
index d221c07612..b703e6656c 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
@@ -160,24 +160,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- 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
- resources:
- limits:
- cpu: 100m
- memory: 100Mi
- requests:
- cpu: 3m
- memory: 20Mi
+ {{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "common.certInitializer.volumes" . | nindent 8 }}
- name: {{ include "common.fullname" . }}-localtime
@@ -188,12 +171,8 @@ spec:
emptyDir:
medium: "Memory"
{{- end }}
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-sdc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
- - name: {{ include "common.fullname" . }}-logs
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
+ - name: logs
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"