Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Disable VES/http"
[oom.git]
/
kubernetes
/
so
/
charts
/
so-bpmn-infra
/
templates
/
configmap.yaml
diff --git
a/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
b/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
index
d873beb
..
a2e2754
100755
(executable)
--- a/
kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
+++ b/
kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
@@
-15,6
+15,7
@@
apiVersion: v1
data:
LOG_PATH: {{ index .Values.logPath }}
APP: {{ index .Values.app }}
data:
LOG_PATH: {{ index .Values.logPath }}
APP: {{ index .Values.app }}
+ ACTIVE_PROFILE: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" "aaf" "value2" "basic")}}
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-configmap
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-configmap
@@
-37,3
+38,12
@@
metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-log
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
+