Merge "[AAI] Helm changes for DMaaP deprecation"

[oom.git] / kubernetes / so / components / so-admin-cockpit / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index e1bac69..7657415 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@ -1,17 +1,13 @@
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
-  {{- if .Values.global.aafEnabled }}
   ssl:
-    keyStore: ${KEYSTORE}
-    keyStorePassword: ${KEYSTORE_PASSWORD}
-    trustStore: ${TRUSTSTORE}
-    trustStorePassword: ${TRUSTSTORE_PASSWORD}
-  {{- end }}
+    enabled: false
   tomcat:
     max-threads: 50
-  {{- if not .Values.global.aafEnabled }}
 ssl-enable: false
-  {{- end }}
 camunda:
   rest:
     api: