commit 2b764d035310d91744b4c22ace83593b9a561116
author othman touijer <othman.touijer@soprasteria.com> Wed Jan 05 14:40:37 2022 +0100
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Tue Jan 25 18:26:59 2022 +0100
tree f637fd322498ce1246d49bf92195352f10d17a0e
parent 0df88b139440c5bb2f0e46e5195bc2455554dc4d

[SDC] Service Mesh Compliance for SDC

Adding basic requirements for Service Mesh Compliance within SDC.

Change-Id: Ib9104ef2e8b6daf0b9b529288cee158b297ce9e4
Issue-ID: OOM-2253
Signed-off-by: rope252 <gareth.roper@est.tech>
Signed-off-by: othman touijer <othman.touijer@soprasteria.com>

kubernetes/sdc/resources/config/environments/AUTO.json

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 3b03205..c953559 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,7 +8,7 @@
     "chef_type": "environment",
 
     "default_attributes": {
-        "disableHttp": {{ .Values.global.security.disableHttp }},
+        "disableHttp": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
         "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -112,11 +112,13 @@
             "username": "user1@sdc.com",
             "password": "password=="
          }
+      {{- if .Values.global.aafEnabled }}
       },
       "jetty": {
          "keystore_pwd": "${KEYSTORE_PASS}",
          "truststore_pwd": "${TRUSTSTORE_PASS}",
          "keymanager_pwd": "${KEYMANAGER_PASS}"
+      {{- end }}
       }
     }
 }