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=dc9a4f2dadc5eba300c782e6c249025d4fb832a6;hb=43d341873203cb894460e593c4b86079758e3d26;hp=e1bac69fe330e093ec7ad1a337891e7ed43067ee;hpb=810890cce295aa33c1b8e2e79b2977b58837ef80;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..dc9a4f2dad 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,4 +1,7 @@
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   {{- if .Values.global.aafEnabled }}
   ssl:
@@ -6,6 +9,9 @@ server:
     keyStorePassword: ${KEYSTORE_PASSWORD}
     trustStore: ${TRUSTSTORE}
     trustStorePassword: ${TRUSTSTORE_PASSWORD}
+  {{- else }}
+  ssl:
+    enabled: false
   {{- end }}
   tomcat:
     max-threads: 50