set ES config in configmap

Alfresco · Oct 23, 2023 · 7c9c7b1 · 7c9c7b1
1 parent 16b0fff
commit 7c9c7b1
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml
@@ -25,9 +25,15 @@ data:
       {{- $searchCtx := dict "Values" (index .Values "alfresco-search") "Chart" .Chart "Release" .Release }}
       {{- $search_url = printf "http://%s-solr/solr" (include "alfresco-search-service.fullname" $searchCtx) }}
     {{- else if eq "elasticsearch" $search_flavor }}
-      {{- $searchCtx := dict "Values" (index .Values "alfresco-search-enterprise") "Chart" .Chart "Release" .Release }}
-      {{- with (index .Values "alfresco-search-enterprise" "elasticsearch") }}
-        {{- $search_url = printf "%s://%s-%s:%v" .protocol .clusterName .nodeGroup .httpPort }}
+      {{- with .Values.elasticsearch }}
+      {{- if .enabled }}
+        {{- $esProto := .protocol | default "http" }}
+        {{- $esHost := printf "%s-%s" (.clusterName | default "elastcisearch") (.nodeGroup | default "master") }}
+        {{- $esPort := .port | default 9200 }}
+        {{- $search_url = coalesce $.Values.global.search.url (printf "%s://%s:%v" $esProto $esHost $esPort) }}
+      {{- else }}
+        {{- fail "Chart is configured to use Alfresco Search Enterprise but no index backend has been provided. Set one using either global.search.url or elasticsearch.enabled" }}
+      {{- end }}
       {{- end }}
       {{- $search_comms := "" }}
       {{- if hasPrefix "https://" $search_url }}