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] SO Admin Cockpit ServiceMesh compatibility
[oom.git]
/
kubernetes
/
so
/
components
/
so-admin-cockpit
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index
e1bac69
..
dc9a4f2
100644
(file)
--- a/
kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@
-1,4
+1,7
@@
server:
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
{{- if .Values.global.aafEnabled }}
ssl:
port: {{ index .Values.containerPort }}
{{- if .Values.global.aafEnabled }}
ssl:
@@
-6,6
+9,9
@@
server:
keyStorePassword: ${KEYSTORE_PASSWORD}
trustStore: ${TRUSTSTORE}
trustStorePassword: ${TRUSTSTORE_PASSWORD}
keyStorePassword: ${KEYSTORE_PASSWORD}
trustStore: ${TRUSTSTORE}
trustStorePassword: ${TRUSTSTORE_PASSWORD}
+ {{- else }}
+ ssl:
+ enabled: false
{{- end }}
tomcat:
max-threads: 50
{{- end }}
tomcat:
max-threads: 50