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] Cleanup of SO charts
[oom.git]
/
kubernetes
/
so
/
components
/
so-sdc-controller
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index
ffa66e9
..
0630497
100755
(executable)
--- a/
kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
@@
-16,6
+16,9
@@
aai:
auth: {{.Values.aai.auth}}
server:
aai:
auth: {{.Values.aai.auth}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
spring:
datasource:
port: {{ index .Values.containerPort }}
spring:
datasource:
@@
-48,49
+51,41
@@
request:
mso:
msoKey: {{ index .Values.mso.msoKey }}
logPath: ./logs/sdc
mso:
msoKey: {{ index .Values.mso.msoKey }}
logPath: ./logs/sdc
- config:
- cadi: {{ include "so.cadi.keys" . | nindent 8}}
catalog:
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
catalog:
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.requestDb.auth )
}}
+ auth: {{
.Values.mso.requestDb.auth
}}
site-name: onapheat
camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
site-name: onapheat
camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.requestDb.auth )
}}
+ auth: {{
.Values.mso.requestDb.auth
}}
aai:
aai:
- {{ if (include "common.needTLS" .) }}
- endpoint: https://aai.{{ include "common.namespace" . }}:8443
- {{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
- {{ end }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
asdc-connections:
asdc-controller1:
user: mso
asdc-connections:
asdc-controller1:
user: mso
- consumerGroup:
SO-OpenSource-Env11
- consumerId:
SO-COpenSource-Env11
+ consumerGroup:
{{ .Values.config.kafka.sdcTopic.consumerGroup }}
+ consumerId:
{{ .Values.config.kafka.sdcTopic.clientId }}
environmentName: AUTO
environmentName: AUTO
- {{ if (include "common.needTLS" .) }}
- asdcAddress: sdc-be.{{ include "common.namespace" . }}:8443
- {{ else }}
- asdcAddress: sdc-be.{{ include "common.namespace" . }}:8080
- {{ end }}
+ sdcAddress: sdc-be.{{ include "common.namespace" . }}:8080
password: {{ index .Values "mso" "asdc-connections" "asdc-controller1" "password" }}
pollingInterval: 60
pollingTimeout: 60
relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
password: {{ index .Values "mso" "asdc-connections" "asdc-controller1" "password" }}
pollingInterval: 60
pollingTimeout: 60
relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
- useHttpsWithDmaap: false
- useHttpsWithSdc: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+ useHttpsWithSdc: false
activateServerTLSAuth: false
keyStorePassword:
keyStorePath:
watchDogTimeout: 300
isFitlerInEmptyResources: true
activateServerTLSAuth: false
keyStorePassword:
keyStorePath:
watchDogTimeout: 300
isFitlerInEmptyResources: true
- messageBusAddress: message-router.{{ include "common.namespace" . }},message-router.{{ include "common.namespace" . }}
+ httpsProxyHost:
+ httpProxyHost:
+ httpsProxyPort: 0
+ httpProxyPort: 0
asdc:
config:
activity:
asdc:
config:
activity: