Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-etsi-sol005-adapter / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index e1e2fc2..c4d28c4 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -33,24 +33,21 @@ spring:
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 mso:
   site-name: localSite
   logPath: ./logs/etsi-sol005-adapter
-  config:
-    cadi: {{ include "so.cadi.keys" . | nindent 8}}
   msb-ip: msb-iag
   msb-port: 80
   adapters:
     requestDb:
-      {{ if (include "common.needTLS" .) }}
-      endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
-      {{ else }}
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
-      {{ end }}
-      auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
+      auth: {{ .Values.mso.adapters.requestDb.auth }}
 #Actuator
 management:
   security: