[SO] Cleanup of SO charts

[oom.git] / kubernetes / so / components / so-etsi-nfvo-ns-lcm / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index cc668fb..40f97ad 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -15,13 +15,9 @@
 */}}
 
 aai:
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
+  auth: {{ .Values.aai.auth }}
   version: v19
-  {{ if (include "common.needTLS" .) }}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
-  {{ else }}
   endpoint: http://aai.{{ include "common.namespace" . }}:80
-  {{ end }}
 spring:
   datasource:
     hikari:
@@ -61,16 +57,7 @@ so:
 etsi-catalog-manager:
   base:
   {{- if .Values.global.msbEnabled }}
-    {{ if (include "common.needTLS" .) }}
-    endpoint: https://msb-iag:443/api
-  http:
-    client:
-      ssl:
-        trust-store: file:${TRUSTSTORE}
-        trust-store-password: ${TRUSTSTORE_PASSWORD}
-    {{ else }}
     endpoint: http://msb-iag:80/api
-    {{ end }}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api
   {{- end }}