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
37024d4
..
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
@@
-16,7
+16,12
@@
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.server.aai.auth ) }}
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.server.aai.auth ) }}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
+ {{ end }}
+ enabled: {{ .Values.global.aai.enabled }}
logging:
path: logs
spring:
logging:
path: logs
spring:
@@
-26,13
+31,17
@@
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
-
+multicloud:
+ endpoint: http://multicloud-k8s.{{ include "common.namespace" . }}:9015
mso:
site-name: localSite
mso:
site-name: localSite
- logPath: ./logs/cnf
+ logPath: ./logs/cnf
-adapter
msb-ip: msb-iag.{{ include "common.namespace" . }}
msb-port: 80
#Actuator
msb-ip: msb-iag.{{ include "common.namespace" . }}
msb-port: 80
#Actuator