diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-11-09 14:01:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-09 14:01:30 +0000 |
| commit | 59ea23af7c260be6f705bc4300cdab2953792e1e (patch) | |
| tree | 6de1fcd76e666156b4edd6b1a392360102d334b0 /kubernetes/so/components/so-sdc-controller | |
| parent | bea32da3552ed09d15d2994fefdd9eae31fad5b3 (diff) | |
| parent | df9ba227fe15004086769f919f0d060f1a7f2687 (diff) | |
Merge "[SO] Use log template"
Diffstat (limited to 'kubernetes/so/components/so-sdc-controller')
| -rwxr-xr-x | kubernetes/so/components/so-sdc-controller/templates/deployment.yaml | 20 | ||||
| -rwxr-xr-x | kubernetes/so/components/so-sdc-controller/values.yaml | 5 |
2 files changed, 7 insertions, 18 deletions
diff --git a/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml index 2609e99781..f370fbd315 100755 --- a/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml +++ b/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml @@ -90,19 +90,7 @@ spec: name: {{ .Values.service.portName }} protocol: TCP # 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 @@ -113,11 +101,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-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index 6f9885650d..e613950fe8 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -148,3 +148,8 @@ serviceAccount: nameOverride: so-sdc-controller roles: - read + +#Logs configuration +log: + path: /var/log/onap +logConfigMapNamePrefix: '{{ include "common.fullname" . }}' |