X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-admin-cockpit%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=7657415f982c09d0bb32dd4601b17e9cc6db9c9e;hb=ad61ccf6cccbe9a9637ef97eb98cee8dd70dce11;hp=e1bac69fe330e093ec7ad1a337891e7ed43067ee;hpb=7e8244a3a3a835a8758ffa865542f4dc53bb6771;p=oom.git

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 e1bac69fe3..7657415f98 100644
--- 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: