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-etsi-sol003-adapter
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
index
33b38ad
..
04d973a
100755
(executable)
--- a/
kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
@@
-14,13
+14,9
@@
# limitations under the License.
*/}}
aai:
# limitations under the License.
*/}}
aai:
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )
}}
+ auth: {{
.Values.aai.auth
}}
version: v15
version: v15
- {{ 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
spring:
security:
usercredentials:
spring:
security:
usercredentials:
@@
-31,6
+27,9
@@
spring:
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
server:
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
ssl:
enabled: false
port: {{ index .Values.containerPort }}
ssl:
enabled: false
@@
-38,30
+37,19
@@
mso:
key: {{ .Values.mso.key }}
site-name: localSite
logPath: ./logs/etsi-sol003-adapter
key: {{ .Values.mso.key }}
site-name: localSite
logPath: ./logs/etsi-sol003-adapter
- config:
- cadi: {{ include "so.cadi.keys" . | nindent 8}}
msb-ip: msb-iag
msb-port: 80
sdc:
msb-ip: msb-iag
msb-port: 80
sdc:
- username: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.username "value2" .Values.sdc.username )
}}
- password: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.password "value2" .Values.sdc.password )
}}
+ username: {{
.Values.sdc.username
}}
+ password: {{
.Values.sdc.password
}}
key: {{ .Values.sdc.key }}
key: {{ .Values.sdc.key }}
- {{ if (include "common.needTLS" .) }}
- endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
- {{ else }}
endpoint: http://sdc-be.{{ include "common.namespace" . }}:8080
endpoint: http://sdc-be.{{ include "common.namespace" . }}:8080
- {{ end }}
vnfmadapter:
endpoint: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092
etsi-catalog-manager:
vnfpkgm:
{{- if .Values.global.msbEnabled }}
vnfmadapter:
endpoint: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092
etsi-catalog-manager:
vnfpkgm:
{{- if .Values.global.msbEnabled }}
- endpoint: https://msb-iag:443/api/vnfpkgm/v1
- http:
- client:
- ssl:
- trust-store: file:${TRUSTSTORE}
- trust-store-password: ${TRUSTSTORE_PASSWORD}
+ endpoint: http://msb-iag:80/api
{{- else }}
endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
{{- end }}
{{- else }}
endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
{{- end }}