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] Port corrections for SM compatibility
[oom.git]
/
kubernetes
/
so
/
components
/
so-etsi-nfvo-ns-lcm
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index
20a4284
..
df47c0a
100644
(file)
--- a/
kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@
-17,7
+17,11
@@
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
version: v19
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
version: v19
+ {{ 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 }}
spring:
datasource:
hikari:
spring:
datasource:
hikari:
@@
-41,6
+45,9
@@
spring:
password: ${ETSI_NFVO_PASSWORD}
role: ETSI-NFVO-Client
server:
password: ${ETSI_NFVO_PASSWORD}
role: ETSI-NFVO-Client
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ .Values.containerPort }}
tomcat:
max-threads: 50
port: {{ .Values.containerPort }}
tomcat:
max-threads: 50
@@
-49,12
+56,16
@@
mso:
so:
adapters:
sol003-adapter:
so:
adapters:
sol003-adapter:
- url: http://so-
vnfm
-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+ url: http://so-
etsi-sol003
-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
auth: {{ .Values.so.sol003.adapter.auth }}
etsi-catalog-manager:
base:
{{- if .Values.global.msbEnabled }}
auth: {{ .Values.so.sol003.adapter.auth }}
etsi-catalog-manager:
base:
{{- if .Values.global.msbEnabled }}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://msb-iag:443/api
endpoint: https://msb-iag:443/api
+ {{ else }}
+ endpoint: http://msb-iag:443/api
+ {{ end }}
http:
client:
ssl:
http:
client:
ssl: