Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SO] Enable SO-Monitoring - use HTTPS and certInitializer
[oom.git]
/
kubernetes
/
so
/
components
/
so-monitoring
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml
index
c2e6ad0
..
cf54fa4
100644
(file)
--- a/
kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml
@@
-1,8
+1,17
@@
server:
port: {{ index .Values.containerPort }}
server:
port: {{ index .Values.containerPort }}
+ {{- if .Values.global.aafEnabled }}
+ ssl:
+ keyStore: ${KEYSTORE}
+ keyStorePassword: ${KEYSTORE_PASSWORD}
+ trustStore: ${TRUSTSTORE}
+ trustStorePassword: ${TRUSTSTORE_PASSWORD}
+ {{- end }}
tomcat:
max-threads: 50
tomcat:
max-threads: 50
+ {{- if not .Values.global.aafEnabled }}
ssl-enable: false
ssl-enable: false
+ {{- end }}
camunda:
rest:
api:
camunda:
rest:
api:
@@
-15,3
+24,12
@@
mso:
api:
url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
auth: Basic YnBlbDpwYXNzd29yZDEk
api:
url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
auth: Basic YnBlbDpwYXNzd29yZDEk
+spring:
+ main:
+ allow-bean-definition-overriding: true
+ security:
+ usercredentials:
+ -
+ username: ${SO_MONITORING_USERNAME}
+ password: ${SO_MONITORING_PASSWORD}
+ role: GUI-Client