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 "[CDS] Add cps-data resourceSourceMapping in application.properties"
[oom.git]
/
kubernetes
/
so
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/resources/config/overrides/override.yaml
b/kubernetes/so/resources/config/overrides/override.yaml
index
efcf029
..
6933607
100755
(executable)
--- a/
kubernetes/so/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/resources/config/overrides/override.yaml
@@
-1,5
+1,9
@@
aai:
aai:
+ {{ 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" . }}:8080
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
server:
port: {{ index .Values.containerPort }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
server:
port: {{ index .Values.containerPort }}
@@
-7,7
+11,7
@@
server:
max-threads: 50
ssl-enable: false
mso:
max-threads: 50
ssl-enable: false
mso:
- msoKey: {{ .Values.
global.app
.msoKey }}
+ msoKey: {{ .Values.
mso
.msoKey }}
logPath: ./logs/apih
site-name: {{ index .Values.global.app.siteName }}
adapters:
logPath: ./logs/apih
site-name: {{ index .Values.global.app.siteName }}
adapters:
@@
-45,13
+49,21
@@
mso:
activate:
instanceid: test
userid: cs0008
activate:
instanceid: test
userid: cs0008
- endpoint: http://sdc-be.{{ include "common.namespace" . }}:8443
+ {{ if (include "common.needTLS" .) }}
+ endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8080
+ {{ end }}
tenant:
isolation:
retry:
count: 3
aai:
tenant:
isolation:
retry:
count: 3
aai:
+ {{ 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" . }}:8080
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
extApi:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
extApi:
@@
-124,4
+136,4
@@
org:
cloud-owner: CloudOwner
adapters:
network:
cloud-owner: CloudOwner
adapters:
network:
- encryptionKey: {{ .Values.
global.app
.msoKey }}
+ encryptionKey: {{ .Values.
mso
.msoKey }}