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 "[EXTAPI] Make NBI ServiceMesh compatible"
[oom.git]
/
kubernetes
/
so
/
components
/
so-cnf-adapter
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
index
0c2f679
..
d667cb5
100755
(executable)
--- a/
kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@
-19,7
+19,7
@@
aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:80
80
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
enabled: {{ .Values.global.aai.enabled }}
logging:
{{ end }}
enabled: {{ .Values.global.aai.enabled }}
logging:
@@
-31,6
+31,9
@@
spring:
password: ${ACTUATOR_PASSWORD}
role: ACTUATOR
server:
password: ${ACTUATOR_PASSWORD}
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50