summaryrefslogtreecommitdiffstats
path: root/kubernetes/modeling/components/modeling-etsicatalog
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-11-22 08:26:55 +0000
committerGerrit Code Review <gerrit@onap.org>2021-11-22 08:26:55 +0000
commit987d87f6b002836e1b70454b2f1809367eb8a5ea (patch)
tree74c486c13df643fc7ed4a8d76d3e03c60a351046 /kubernetes/modeling/components/modeling-etsicatalog
parent68a473611ac075f620e7796530351b1664846936 (diff)
parent172c0860cffb5fdfa2fc5e2348193da852ee1376 (diff)
Merge "[MODELING] Use log template"
Diffstat (limited to 'kubernetes/modeling/components/modeling-etsicatalog')
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml (renamed from kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/filebeat/filebeat.yml)0
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml (renamed from kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/server/log.yml)0
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml10
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml20
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/values.yaml6
5 files changed, 11 insertions, 25 deletions
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/filebeat/filebeat.yml b/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
index 0bc14ea908..0bc14ea908 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/filebeat/filebeat.yml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/server/log.yml b/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
index 5ac5fefe92..5ac5fefe92 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/logging/server/log.yml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml
index 1a2112bbe2..fc16d8c0a0 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml
@@ -20,12 +20,6 @@ metadata:
name: {{ include "common.fullname" . }}-logging-configmap
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/logging/server/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/server/*").AsConfig . | indent 2 }}
---
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-modeling-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logging/filebeat/*").AsConfig . | indent 2 }} \ No newline at end of file
+{{ include "common.log.configMap" . }}
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index 8e28071ba6..d9cbbef15b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -111,7 +111,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/modeling/etsicatalog/config/log.yml
subPath: log.yml
@@ -127,17 +127,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 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: {{ include "common.fullname" . }}-etsicatalog
@@ -156,10 +146,6 @@ spec:
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.fullname" . }}-modeling-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" . | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 3af4bae554..b4d88375fc 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -28,6 +28,8 @@ global:
internalPort: 3306
nameOverride: mariadb-galera
+ centralizedLoggingEnabled: true
+
readinessCheck:
wait_for:
msb:
@@ -183,3 +185,7 @@ serviceAccount:
nameOverride: modeling-etsicatalog
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap