From 9fb23ff03a0245c24ebdca652fee1841f0180bf8 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 15:16:38 +0200
Subject: [PATCH 01/15] remove global elasticsearch as we introduce configmap
 support

---
 charts/alfresco-search-enterprise/README.md       |  7 -------
 .../templates/_helpers-elasticsearch.tpl          |  8 ++++----
 .../templates/secret-elasticsearch.yaml           |  6 +++---
 charts/alfresco-search-enterprise/values.yaml     | 15 ---------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index f1240ede..e98d5515 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -31,13 +31,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | elasticsearch.replicas | int | `1` |  |
 | fullnameOverride | string | `""` |  |
 | global.alfrescoRegistryPullSecrets | string | `"quay-registry-secret"` |  |
-| global.elasticsearch | object | `{"existingSecretName":null,"host":null,"password":null,"port":null,"protocol":null,"user":null}` | Shared connections details for Elasticsearch/Opensearch cluster |
-| global.elasticsearch.existingSecretName | string | `nil` | Alternatively, provide connection details via an existing secret that contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys |
-| global.elasticsearch.host | string | `nil` | The host where service is available |
-| global.elasticsearch.password | string | `nil` | The password required to access the service, if any |
-| global.elasticsearch.port | string | `nil` | The port where service is available |
-| global.elasticsearch.protocol | string | `nil` | Valid values are http or https |
-| global.elasticsearch.user | string | `nil` | The username required to access the service, if any |
 | imagePullSecrets | list | `[]` |  |
 | indexName | string | `"alfresco"` | Name of the existing search index, usually created by repo |
 | liveIndexing.content.image.pullPolicy | string | `"IfNotPresent"` |  |
diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index c1687746..9a725a1b 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -1,15 +1,15 @@
 {{- define "alfresco-search-enterprise.searchIndexExistingSecretName" -}}
-{{- coalesce .Values.searchIndex.existingSecretName .Values.global.elasticsearch.existingSecretName (printf "%s-elasticsearch-secret" (include "alfresco-search-enterprise.fullname" .)) }}
+{{- coalesce .Values.searchIndex.existingSecretName (printf "%s-elasticsearch-secret" (include "alfresco-search-enterprise.fullname" .)) }}
 {{- end -}}
 
 {{- define "alfresco-search-enterprise.config.spring" -}}
 {{- if .Values.elasticsearch.enabled -}}
   SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.elasticsearch.protocol }}://{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
 {{- else }}
-  {{- if and (not .Values.global.elasticsearch.host) (not .Values.searchIndex.host) }}
-    {{- fail "Please provide external elasticsearch connection details as values under .global.elasticsearch or .searchIndex or enable the embedded elasticsearch via .elasticsearch.enabled" }}
+  {{- if not .Values.searchIndex.host }}
+    {{- fail "Please provide external elasticsearch connection details as values .searchIndex or enable the embedded elasticsearch via .elasticsearch.enabled" }}
   {{- end -}}
-  SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol | default .Values.global.elasticsearch.protocol }}://{{ .Values.searchIndex.host | default .Values.global.elasticsearch.host }}:{{ .Values.searchIndex.port | default .Values.global.elasticsearch.port }}"
+  SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol }}://{{ .Values.searchIndex.host }}:{{ .Values.searchIndex.port }}"
 {{- end -}}
 {{- end -}}
 
diff --git a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
index 43e0e1b1..fb3db871 100644
--- a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.global.elasticsearch.existingSecretName) (not .Values.searchIndex.existingSecretName) }}
+{{- if not .Values.searchIndex.existingSecretName }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,6 +7,6 @@ metadata:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 type: Opaque
 data:
-  ELASTICSEARCH_USERNAME: {{ .Values.searchIndex.user | default .Values.global.elasticsearch.user | default "" | b64enc | quote }}
-  ELASTICSEARCH_PASSWORD: {{ .Values.searchIndex.password | default .Values.global.elasticsearch.password | default "" | b64enc | quote }}
+  ELASTICSEARCH_USERNAME: {{ .Values.searchIndex.user | default "" | b64enc | quote }}
+  ELASTICSEARCH_PASSWORD: {{ .Values.searchIndex.password | default "" | b64enc | quote }}
 {{- end }}
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 4c4f7522..04b0252a 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -163,21 +163,6 @@ searchIndex:
   existingSecretName: null
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
-  # -- Shared connections details for Elasticsearch/Opensearch cluster
-  elasticsearch:
-    # -- The host where service is available
-    host: null
-    # -- The port where service is available
-    port: null
-    # -- Valid values are http or https
-    protocol: null
-    # -- The username required to access the service, if any
-    user: null
-    # -- The password required to access the service, if any
-    password: null
-    # -- Alternatively, provide connection details via an existing secret that
-    # contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys
-    existingSecretName: null
 elasticsearch:
   # -- Enable embedded elasticsearch - useful when using this chart in standalone
   enabled: false

From 9dc9fe3d83e4d98298bb65f6763005454a7c72f9 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 16:38:09 +0200
Subject: [PATCH 02/15] bugfix

---
 .../templates/liveindexing-deployment.yaml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
index 937065e5..7d9d80ab 100644
--- a/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
+++ b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
@@ -44,7 +44,6 @@ spec :
             {{- include "alfresco-common.spring.activemq.env" . | nindent 12 }}
             {{- include "alfresco-search-enterprise.config.spring.envCredentials" $ | nindent 12 }}
             {{- include "alfresco-search-enterprise.env" $ | nindent 12 }}
-            {{- range $key, $val := $.Values.liveIndexing.environment }}
             {{- $atsCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" ($.Values.nameOverride | default $.Chart.Name) "ats")) "Chart" $.Chart "Release" $.Release }}
             {{- $ats_cm := coalesce $.Values.ats.existingConfigMap.name (include "alfresco-search-enterprise.fullname" $atsCtx) }}
             - name: ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL
@@ -57,6 +56,7 @@ spec :
                 configMapKeyRef:
                   name: {{ $ats_cm }}
                   key: {{ $.Values.ats.existingConfigMap.keys.sfs_url }}
+            {{- range $key, $val := $.Values.liveIndexing.environment }}
             - name: {{ $key }}
               value: {{ $val | quote }}
             {{- end }}

From 9d21ef36267ce20cde2f827de2c1378f7b6f6c9b Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 16:40:17 +0200
Subject: [PATCH 03/15] use tag condition for elasticsearch dep

---
 charts/alfresco-search-enterprise/Chart.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
index 771056d7..b3818ed4 100644
--- a/charts/alfresco-search-enterprise/Chart.yaml
+++ b/charts/alfresco-search-enterprise/Chart.yaml
@@ -17,4 +17,5 @@ dependencies:
   - name: elasticsearch
     repository: https://helm.elastic.co
     version: 7.17.3
-    condition: elasticsearch.enabled
+    tags:
+      - ci

From 63bdc4807121db8ee407cefff1c1b32b95a90e73 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 16:48:02 +0200
Subject: [PATCH 04/15] remove ref to elasticsearch dep

---
 charts/alfresco-search-enterprise/README.md            |  3 ---
 .../alfresco-search-enterprise/ci/default-values.yaml  |  7 ++++++-
 .../templates/_helpers-elasticsearch.tpl               | 10 +++-------
 charts/alfresco-search-enterprise/values.yaml          |  5 -----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index e98d5515..bc5f6895 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -26,9 +26,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | ats.transform_url | string | `nil` | URL of the alfresco transform (trouter or tengine-aio) |
 | contentMediaTypeCache.enabled | bool | `true` |  |
 | contentMediaTypeCache.refreshTime | string | `"0 0 * * * *"` |  |
-| elasticsearch.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
-| elasticsearch.enabled | bool | `false` | Enable embedded elasticsearch - useful when using this chart in standalone |
-| elasticsearch.replicas | int | `1` |  |
 | fullnameOverride | string | `""` |  |
 | global.alfrescoRegistryPullSecrets | string | `"quay-registry-secret"` |  |
 | imagePullSecrets | list | `[]` |  |
diff --git a/charts/alfresco-search-enterprise/ci/default-values.yaml b/charts/alfresco-search-enterprise/ci/default-values.yaml
index 2467791d..f9da3f68 100644
--- a/charts/alfresco-search-enterprise/ci/default-values.yaml
+++ b/charts/alfresco-search-enterprise/ci/default-values.yaml
@@ -15,8 +15,13 @@ resources:
   limits:
     cpu: "1"
     memory: "1Gi"
+searchIndex:
+  protocol: http
+  host: elasticsearch-master
+  port: 80
 elasticsearch:
-  enabled: true
+  replicas: 1
+  clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
   esJavaOpts: "-Xmx512m -Xms512m"
   resources:
     requests:
diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index 9a725a1b..5808baec 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -3,14 +3,10 @@
 {{- end -}}
 
 {{- define "alfresco-search-enterprise.config.spring" -}}
-{{- if .Values.elasticsearch.enabled -}}
-  SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.elasticsearch.protocol }}://{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
-{{- else }}
-  {{- if not .Values.searchIndex.host }}
-    {{- fail "Please provide external elasticsearch connection details as values .searchIndex or enable the embedded elasticsearch via .elasticsearch.enabled" }}
-  {{- end -}}
-  SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol }}://{{ .Values.searchIndex.host }}:{{ .Values.searchIndex.port }}"
+{{- if not .Values.searchIndex.host }}
+  {{- fail "Please provide elasticsearch connection details as .searchIndex values or using an .searchIndex.existingConfigMap." }}
 {{- end -}}
+SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol }}://{{ .Values.searchIndex.host }}:{{ .Values.searchIndex.port }}"
 {{- end -}}
 
 {{- define "alfresco-search-enterprise.config.spring.envCredentials" -}}
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 04b0252a..0ccba5fc 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -163,11 +163,6 @@ searchIndex:
   existingSecretName: null
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
-elasticsearch:
-  # -- Enable embedded elasticsearch - useful when using this chart in standalone
-  enabled: false
-  replicas: 1
-  clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
 
 tags:
   # -- A chart tag used for Hyland's CI purpose. Do not set it to true.

From ff1fed206faaea642fbc6de41edb3a88e7e99bee Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 16:53:42 +0200
Subject: [PATCH 05/15] align tests

---
 .../ci/default-values.yaml                      |  2 +-
 .../tests/liveindexing-deployment_test.yaml     | 17 ++---------------
 .../tests/secret-elasticsearch_test.yaml        |  8 ++------
 .../tests/values/embedded-charts-values.yaml    |  4 ++++
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/charts/alfresco-search-enterprise/ci/default-values.yaml b/charts/alfresco-search-enterprise/ci/default-values.yaml
index f9da3f68..79eb8c5a 100644
--- a/charts/alfresco-search-enterprise/ci/default-values.yaml
+++ b/charts/alfresco-search-enterprise/ci/default-values.yaml
@@ -18,7 +18,7 @@ resources:
 searchIndex:
   protocol: http
   host: elasticsearch-master
-  port: 80
+  port: 9200
 elasticsearch:
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index 605b8f5b..97498009 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -10,21 +10,14 @@ templates:
 tests:
   - it: |
       Render elasticsearch Liveindexing configmap,
-      using global config to ensure it overrides default values.
+      using provided values
     values: &testvalues
       - values/embedded-charts-values.yaml
-    set:
-      global:
-        elasticsearch:
-          host: someglobally.used.host
-          user: admin
-          protocol: https
-          port: 1443
     template: liveindexing-deployment.yaml
     asserts:
       - equal:
           path: data.SPRING_ELASTICSEARCH_REST_URIS
-          value: https://someglobally.used.host:1443
+          value: http://elasticsearch-master:9200
         template: configmap-elasticsearch.yaml
       - contains:
           path: spec.template.spec.containers[0].env
@@ -40,8 +33,6 @@ tests:
     values: *testvalues
     template: liveindexing-deployment.yaml
     set:
-      elasticsearch:
-        enabled: true
       searchIndex:
         existingSecretName: nooneknows
       messageBroker:
@@ -66,10 +57,6 @@ tests:
           path: data.SFS_URL
           value: http://sfs/alfresco/api/-default-/private/sfs/versions/1/file/
         template: configmap-ats.yaml
-      - equal:
-          path: data.SPRING_ELASTICSEARCH_REST_URIS
-          value: http://elasticsearch-master:9200
-        template: configmap-elasticsearch.yaml
       - contains:
           path: spec.template.spec.containers[0].env
           content:
diff --git a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
index 56e9dbc1..6fa44321 100644
--- a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
@@ -4,10 +4,6 @@ templates:
   - secret-elasticsearch.yaml
 tests:
   - it: should have empty credentials as default
-    set:
-      global.elasticsearch:
-          user: null
-          password: null
     asserts:
       - equal:
           path: data.ELASTICSEARCH_USERNAME
@@ -18,7 +14,7 @@ tests:
 
   - it: should have credentials populated when global credentials are set
     set:
-      global.elasticsearch:
+      searchIndex:
           user: admin
           password: letmein
     asserts:
@@ -31,7 +27,7 @@ tests:
 
   - it: should not have a secret when global existingSecretName is set
     set:
-      global.elasticsearch:
+      searchIndex:
           existingSecretName: whatever
     asserts:
       - hasDocuments:
diff --git a/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml b/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
index e630b951..ce5a58a1 100644
--- a/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
+++ b/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
@@ -1,5 +1,9 @@
 messageBroker:
   url: tcp://localhost:61616
+searchIndex:
+  host: elasticsearch-master
+  protocol: http
+  port: 9200
 ats:
   transform_url: http://transform
   sfs_url: http://sfs

From 01f997ef8c44491e6d64399b31e8b74d5e8975d0 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 16:58:10 +0200
Subject: [PATCH 06/15] remove ref to global.elasticsearch in doc

---
 charts/alfresco-search-enterprise/README.md   | 9 ++++-----
 charts/alfresco-search-enterprise/values.yaml | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index bc5f6895..140cea11 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -82,13 +82,12 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
-| searchIndex | object | `{"existingSecretName":null,"host":null,"password":null,"port":null,"protocol":null,"user":null}` | Overrides .Values.global.elasticsearch |
 | searchIndex.existingSecretName | string | `nil` | Alternatively, provide connection details via an an existing secret that contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys |
-| searchIndex.host | string | `nil` | The host where service is available |
-| searchIndex.password | string | `nil` | The password required to access the service, if any |
-| searchIndex.port | string | `nil` | The port where service is available |
+| searchIndex.host | string | `nil` | The host where the elasticsearch service is available |
+| searchIndex.password | string | `nil` | The password required to access the elasticsearch service, if any |
+| searchIndex.port | string | `nil` | The port where the elasticsearch service is available |
 | searchIndex.protocol | string | `nil` | Valid values are http or https |
-| searchIndex.user | string | `nil` | The username required to access the service, if any |
+| searchIndex.user | string | `nil` | The username required to access the elasticsearch service, if any |
 | securityContext | object | `{}` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 0ccba5fc..17de061e 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -146,17 +146,16 @@ messageBroker:
     keys:
       username: BROKER_USERNAME
       password: BROKER_PASSWORD
-# -- Overrides .Values.global.elasticsearch
 searchIndex:
-  # -- The host where service is available
+  # -- The host where the elasticsearch service is available
   host: null
-  # -- The port where service is available
+  # -- The port where the elasticsearch service is available
   port: null
   # -- Valid values are http or https
   protocol: null
-  # -- The username required to access the service, if any
+  # -- The username required to access the elasticsearch service, if any
   user: null
-  # -- The password required to access the service, if any
+  # -- The password required to access the elasticsearch service, if any
   password: null
   # -- Alternatively, provide connection details via an an existing secret that
   # contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys

From 8cf21a3aa5c225f68a8e3e3edb40d3c4f81c3265 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 17:23:11 +0200
Subject: [PATCH 07/15] rename elasticsearch's existingSecretName to
 exsitignSecret.name

---
 charts/alfresco-search-enterprise/README.md           |  4 +++-
 .../templates/_helpers-elasticsearch.tpl              |  2 +-
 .../templates/secret-elasticsearch.yaml               | 10 ++++++----
 .../tests/liveindexing-deployment_test.yaml           |  3 ++-
 .../tests/secret-elasticsearch_test.yaml              |  7 ++++---
 charts/alfresco-search-enterprise/values.yaml         | 11 ++++++++---
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 140cea11..0a01385e 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -82,7 +82,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
-| searchIndex.existingSecretName | string | `nil` | Alternatively, provide connection details via an an existing secret that contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys |
+| searchIndex.existingSecret.keys.password | string | `"ELASTICSEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
+| searchIndex.existingSecret.keys.username | string | `"ELASTICSEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
+| searchIndex.existingSecret.name | string | `nil` | Alternatively, provide elasticsearch credentials via an existing secret |
 | searchIndex.host | string | `nil` | The host where the elasticsearch service is available |
 | searchIndex.password | string | `nil` | The password required to access the elasticsearch service, if any |
 | searchIndex.port | string | `nil` | The port where the elasticsearch service is available |
diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index 5808baec..c044fd90 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -1,5 +1,5 @@
 {{- define "alfresco-search-enterprise.searchIndexExistingSecretName" -}}
-{{- coalesce .Values.searchIndex.existingSecretName (printf "%s-elasticsearch-secret" (include "alfresco-search-enterprise.fullname" .)) }}
+{{- coalesce .Values.searchIndex.existingSecret.name (printf "%s-elasticsearch-secret" (include "alfresco-search-enterprise.fullname" .)) }}
 {{- end -}}
 
 {{- define "alfresco-search-enterprise.config.spring" -}}
diff --git a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
index fb3db871..fe0eb3dd 100644
--- a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
@@ -1,12 +1,14 @@
-{{- if not .Values.searchIndex.existingSecretName }}
+{{- with .Values.searchIndex }}
+{{- if not .existingSecret.name }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "alfresco-search-enterprise.fullname" . }}-elasticsearch-secret
+  name: {{ template "alfresco-search-enterprise.fullname" $ }}-elasticsearch-secret
   labels:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 type: Opaque
 data:
-  ELASTICSEARCH_USERNAME: {{ .Values.searchIndex.user | default "" | b64enc | quote }}
-  ELASTICSEARCH_PASSWORD: {{ .Values.searchIndex.password | default "" | b64enc | quote }}
+  ELASTICSEARCH_USERNAME: {{ .user | default "" | b64enc | quote }}
+  ELASTICSEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
+{{- end }}
 {{- end }}
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index 97498009..be6e350f 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -34,7 +34,8 @@ tests:
     template: liveindexing-deployment.yaml
     set:
       searchIndex:
-        existingSecretName: nooneknows
+        existingSecret:
+          name: nooneknows
       messageBroker:
         existingConfigMap:
           name: mymqcm
diff --git a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
index 6fa44321..e8f2119f 100644
--- a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
@@ -12,7 +12,7 @@ tests:
           path: data.ELASTICSEARCH_PASSWORD
           value: ""
 
-  - it: should have credentials populated when global credentials are set
+  - it: should have credentials populated when credentials are set
     set:
       searchIndex:
           user: admin
@@ -25,10 +25,11 @@ tests:
           path: data.ELASTICSEARCH_PASSWORD
           value: bGV0bWVpbg==
 
-  - it: should not have a secret when global existingSecretName is set
+  - it: should not have a secret when existingSecret is set
     set:
       searchIndex:
-          existingSecretName: whatever
+        existingSecret:
+          name: whatever
     asserts:
       - hasDocuments:
           count: 0
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 17de061e..08596e98 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -157,9 +157,14 @@ searchIndex:
   user: null
   # -- The password required to access the elasticsearch service, if any
   password: null
-  # -- Alternatively, provide connection details via an an existing secret that
-  # contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys
-  existingSecretName: null
+  existingSecret:
+    # -- Alternatively, provide elasticsearch credentials via an existing secret
+    name: null
+    keys:
+      # -- Key within the secret that holds the elasticsearch username
+      username: ELASTICSEARCH_USERNAME
+      # -- Key within the secret that holds the elasticsearch password
+      password: ELASTICSEARCH_PASSWORD
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
 

From c63df67db25f59678f44ddf4b31f13cd45d375b9 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 17:48:12 +0200
Subject: [PATCH 08/15] alow custom keys within ES existingSecret

---
 .../templates/_helpers-elasticsearch.tpl      | 16 ++++----
 .../templates/secret-elasticsearch.yaml       |  3 +-
 .../tests/liveindexing-deployment_test.yaml   | 41 +++++++++++++++++--
 .../tests/reindexing-job_test.yaml            |  4 +-
 4 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index c044fd90..1a75a214 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -1,7 +1,3 @@
-{{- define "alfresco-search-enterprise.searchIndexExistingSecretName" -}}
-{{- coalesce .Values.searchIndex.existingSecret.name (printf "%s-elasticsearch-secret" (include "alfresco-search-enterprise.fullname" .)) }}
-{{- end -}}
-
 {{- define "alfresco-search-enterprise.config.spring" -}}
 {{- if not .Values.searchIndex.host }}
   {{- fail "Please provide elasticsearch connection details as .searchIndex values or using an .searchIndex.existingConfigMap." }}
@@ -10,14 +6,18 @@ SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol }}://{{ .Values
 {{- end -}}
 
 {{- define "alfresco-search-enterprise.config.spring.envCredentials" -}}
+{{- $esCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" (.Values.nameOverride | default .Chart.Name) "es")) "Chart" .Chart "Release" .Release }}
+{{- with .Values.searchIndex }}
+{{- $esSecret := coalesce .existingSecret.name (include "alfresco-search-enterprise.fullname" $esCtx) }}
 - name: SPRING_ELASTICSEARCH_REST_USERNAME
   valueFrom:
     secretKeyRef:
-      name: {{ template "alfresco-search-enterprise.searchIndexExistingSecretName" $ }}
-      key: ELASTICSEARCH_USERNAME
+      name: {{ $esSecret }}
+      key: {{ .existingSecret.keys.username }}
 - name: SPRING_ELASTICSEARCH_REST_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ template "alfresco-search-enterprise.searchIndexExistingSecretName" $ }}
-      key: ELASTICSEARCH_PASSWORD
+      name: {{ $esSecret }}
+      key: {{ .existingSecret.keys.password }}
+{{- end }}
 {{- end -}}
diff --git a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
index fe0eb3dd..9b2c58b3 100644
--- a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
@@ -3,7 +3,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "alfresco-search-enterprise.fullname" $ }}-elasticsearch-secret
+  {{- $ctx := dict "Values" (dict "nameOverride" (printf "%s-%s" ($.Values.nameOverride | default $.Chart.Name) "es")) "Chart" $.Chart "Release" $.Release }}
+  name: {{ template "alfresco-search-enterprise.fullname" $ctx }}
   labels:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 type: Opaque
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index be6e350f..7cc1c4d3 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -10,7 +10,7 @@ templates:
 tests:
   - it: |
       Render elasticsearch Liveindexing configmap,
-      using provided values
+      using provided values and check deployment has appropriate defaults
     values: &testvalues
       - values/embedded-charts-values.yaml
     template: liveindexing-deployment.yaml
@@ -27,6 +27,38 @@ tests:
               configMapKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-mq
                 key: BROKER_URL
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SPRING_ELASTICSEARCH_REST_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-es
+                key: ELASTICSEARCH_USERNAME
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SPRING_ELASTICSEARCH_REST_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-es
+                key: ELASTICSEARCH_PASSWORD
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL
+            valueFrom:
+              configMapKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-ats
+                key: ATS_URL
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ALFRESCO_SHAREDFILESTORE_BASEURL
+            valueFrom:
+              configMapKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-ats
+                key: SFS_URL
 
   - it: |
       Render default mainfest with embedded elasticsearch and pre-existing secret
@@ -36,6 +68,9 @@ tests:
       searchIndex:
         existingSecret:
           name: nooneknows
+          keys:
+            username: ESUSER
+            password: ESPASS
       messageBroker:
         existingConfigMap:
           name: mymqcm
@@ -65,7 +100,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: nooneknows
-                key: ELASTICSEARCH_USERNAME
+                key: ESUSER
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -73,7 +108,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: nooneknows
-                key: ELASTICSEARCH_PASSWORD
+                key: ESPASS
       - equal:
           path: spec.template.spec.containers[0].resources
           value:
diff --git a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
index df977515..c245816d 100644
--- a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
@@ -122,7 +122,7 @@ tests:
             name: SPRING_ELASTICSEARCH_REST_USERNAME
             valueFrom:
               secretKeyRef:
-                name: RELEASE-NAME-alfresco-search-enterprise-elasticsearch-secret
+                name: RELEASE-NAME-alfresco-search-enterprise-es
                 key: ELASTICSEARCH_USERNAME
       - contains:
           path: spec.template.spec.containers[0].env
@@ -130,7 +130,7 @@ tests:
             name: SPRING_ELASTICSEARCH_REST_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: RELEASE-NAME-alfresco-search-enterprise-elasticsearch-secret
+                name: RELEASE-NAME-alfresco-search-enterprise-es
                 key: ELASTICSEARCH_PASSWORD
 
   - it: should not be present when disabled

From 0128784a8a916822e1399294ddac1235d075c873 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 17:51:15 +0200
Subject: [PATCH 09/15] introduce ES existingConfigMap

---
 charts/alfresco-search-enterprise/README.md   |  4 +++-
 charts/alfresco-search-enterprise/values.yaml | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 0a01385e..f39f0bbd 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -45,8 +45,8 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | liveIndexing.path.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-path"` |  |
 | liveIndexing.path.image.tag | string | `"3.3.1"` |  |
 | liveIndexing.path.replicaCount | int | `1` |  |
-| messageBroker.existingConfigMap | object | `{"keys":{"url":"BROKER_URL"},"name":null}` | Alternatively, provide message broker connection details via an existing configmap |
 | messageBroker.existingConfigMap.keys.url | string | `"BROKER_URL"` | Key within the configmap holding the URL of the message broker |
+| messageBroker.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
 | messageBroker.existingSecret | object | `{"keys":{"password":"BROKER_PASSWORD","username":"BROKER_USERNAME"},"name":null}` | Provide connection details alternatively via an existing secret that contains BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys |
 | messageBroker.password | string | `nil` | Broker password |
 | messageBroker.url | string | `nil` | Broker URL formatted as per: https://activemq.apache.org/failover-transport-reference |
@@ -82,6 +82,8 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
+| searchIndex.existingConfigMap.keys.url | string | `nil` | Key within the configmap holding the URL of the elasticsearch service |
+| searchIndex.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
 | searchIndex.existingSecret.keys.password | string | `"ELASTICSEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
 | searchIndex.existingSecret.keys.username | string | `"ELASTICSEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
 | searchIndex.existingSecret.name | string | `nil` | Alternatively, provide elasticsearch credentials via an existing secret |
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 08596e98..cc4aee42 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -132,9 +132,9 @@ messageBroker:
   username: null
   # -- Broker password
   password: null
-  # -- Alternatively, provide message broker connection details via an existing
-  # configmap
   existingConfigMap:
+    # -- Alternatively, provide message broker connection details via an existing
+    # configmap
     name: null
     keys:
       # -- Key within the configmap holding the URL of the message broker
@@ -157,6 +157,13 @@ searchIndex:
   user: null
   # -- The password required to access the elasticsearch service, if any
   password: null
+  existingConfigMap:
+    # -- Alternatively, provide message broker connection details via an existing
+    # configmap
+    name: null
+    keys:
+      # -- Key within the configmap holding the URL of the elasticsearch service
+      url: null
   existingSecret:
     # -- Alternatively, provide elasticsearch credentials via an existing secret
     name: null

From 2a0214a442d4d145786edb5523ba68dae4569e81 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 18:17:12 +0200
Subject: [PATCH 10/15] add alfresco-search-enterprise.config.spring.es.env to
 project ES url in pods

---
 charts/alfresco-search-enterprise/README.md   |  2 +-
 .../templates/_helpers-elasticsearch.tpl      | 25 +++++++++++++++----
 .../templates/configmap-elasticsearch.yaml    | 11 ++++++--
 .../templates/liveindexing-deployment.yaml    |  4 +--
 .../templates/reindexing-job.yaml             |  4 +--
 charts/alfresco-search-enterprise/values.yaml |  2 +-
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index f39f0bbd..11864819 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -82,7 +82,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
-| searchIndex.existingConfigMap.keys.url | string | `nil` | Key within the configmap holding the URL of the elasticsearch service |
+| searchIndex.existingConfigMap.keys.url | string | `"ELASTICSEARCH_URL"` | Key within the configmap holding the URL of the elasticsearch service |
 | searchIndex.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
 | searchIndex.existingSecret.keys.password | string | `"ELASTICSEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
 | searchIndex.existingSecret.keys.username | string | `"ELASTICSEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index 1a75a214..635d497c 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -1,10 +1,25 @@
-{{- define "alfresco-search-enterprise.config.spring" -}}
-{{- if not .Values.searchIndex.host }}
-  {{- fail "Please provide elasticsearch connection details as .searchIndex values or using an .searchIndex.existingConfigMap." }}
-{{- end -}}
-SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.searchIndex.protocol }}://{{ .Values.searchIndex.host }}:{{ .Values.searchIndex.port }}"
+{{/*
+
+Usage: include "alfresco-search-enterprise.config.spring.es.env" $
+
+*/}}
+{{- define "alfresco-search-enterprise.config.spring.es.env" -}}
+{{- $esCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" (.Values.nameOverride | default .Chart.Name) "es")) "Chart" .Chart "Release" .Release }}
+{{- with .Values.searchIndex }}
+{{- $esCm := coalesce .existingConfigMap.name (include "alfresco-search-enterprise.fullname" $esCtx) }}
+- name: SPRING_ELASTICSEARCH_REST_URIS
+  valueFrom:
+    configMapKeyRef:
+      name: {{ $esCm }}
+      key: {{ .existingConfigMap.keys.url }}
+{{- end }}
 {{- end -}}
 
+{{/*
+
+Usage: include "alfresco-search-enterprise.config.spring.envCredentials" $
+
+*/}}
 {{- define "alfresco-search-enterprise.config.spring.envCredentials" -}}
 {{- $esCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" (.Values.nameOverride | default .Chart.Name) "es")) "Chart" .Chart "Release" .Release }}
 {{- with .Values.searchIndex }}
diff --git a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
index 8f4b242f..31561c12 100644
--- a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
@@ -1,8 +1,15 @@
+{{- if not .Values.searchIndex.existingConfigMap.name }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "alfresco-search-enterprise.fullname" . }}-es
+  {{- $ctx := dict "Values" (dict "nameOverride" (printf "%s-%s" ($.Values.nameOverride | default $.Chart.Name) "es")) "Chart" $.Chart "Release" $.Release }}
+  name: {{ template "alfresco-search-enterprise.fullname" $ctx }}
   labels:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 data:
-  {{ template "alfresco-search-enterprise.config.spring" . }}
+  {{- $reqMsg := "Please provide elasticsearch connection details as .searchIndex values or using an .searchIndex.existingConfigMap." }}
+  {{- $esProtocol := required $reqMsg .Values.searchIndex.protocol }}
+  {{- $esHost := required $reqMsg .Values.searchIndex.host }}
+  {{- $esPort := required $reqMsg .Values.searchIndex.port }}
+  ELASTICSEARCH_URL: {{ printf "%s://%s:%v" $esProtocol $esHost $esPort }}
+{{- end }}
diff --git a/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
index 7d9d80ab..27e28f31 100644
--- a/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
+++ b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
@@ -35,14 +35,12 @@ spec :
             {{ index $.Values "liveIndexing" (printf "%s" $serviceName)  "image" "tag" }}"
           imagePullPolicy: {{ index $.Values "liveIndexing" (printf "%s" $serviceName)  "image" "pullPolicy" }}
             {{- include "alfresco-common.component-security-context" .Values | indent 8 }}
-          envFrom:
-            - configMapRef:
-                name: {{ template "alfresco-search-enterprise.fullname" $ }}-es
           env:
             {{- include "alfresco-search-enterprise.activemq.secret.env" $ | nindent 12 }}
             {{- include "alfresco-search-enterprise.activemq.cm.env" $ | nindent 12 }}
             {{- include "alfresco-common.spring.activemq.env" . | nindent 12 }}
             {{- include "alfresco-search-enterprise.config.spring.envCredentials" $ | nindent 12 }}
+            {{- include "alfresco-search-enterprise.config.spring.es.env" $ | nindent 12 }}
             {{- include "alfresco-search-enterprise.env" $ | nindent 12 }}
             {{- $atsCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" ($.Values.nameOverride | default $.Chart.Name) "ats")) "Chart" $.Chart "Release" $.Release }}
             {{- $ats_cm := coalesce $.Values.ats.existingConfigMap.name (include "alfresco-search-enterprise.fullname" $atsCtx) }}
diff --git a/charts/alfresco-search-enterprise/templates/reindexing-job.yaml b/charts/alfresco-search-enterprise/templates/reindexing-job.yaml
index b3e23af6..59209bfe 100644
--- a/charts/alfresco-search-enterprise/templates/reindexing-job.yaml
+++ b/charts/alfresco-search-enterprise/templates/reindexing-job.yaml
@@ -25,9 +25,6 @@ spec:
           imagePullPolicy: {{ .Values.reindexing.image.pullPolicy }}
           {{- include "alfresco-common.component-security-context" .Values | indent 8 }}
           resources: {{- toYaml .Values.reindexing.resources | nindent 12 }}
-          envFrom:
-            - configMapRef:
-                name: {{ template "alfresco-search-enterprise.fullname" . }}-es
           env:
             {{- $dbCtx := dict "Values" (dict "nameOverride" "alfresco-database") "Chart" .Chart "Release" .Release }}
             {{- $dbFullName := (include "alfresco-search-enterprise.fullname" $dbCtx) }}
@@ -35,6 +32,7 @@ spec:
             {{- include "alfresco-search-enterprise.activemq.secret.env" . | nindent 12 }}
             {{- include "alfresco-search-enterprise.activemq.cm.env" . | nindent 12 }}
             {{- include "alfresco-common.spring.activemq.env" . | nindent 12 }}
+            {{- include "alfresco-search-enterprise.config.spring.es.env" $ | nindent 12 }}
             {{- include "alfresco-search-enterprise.config.spring.envCredentials" . | nindent 12 }}
             - name: ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL
               valueFrom:
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index cc4aee42..57105aac 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -163,7 +163,7 @@ searchIndex:
     name: null
     keys:
       # -- Key within the configmap holding the URL of the elasticsearch service
-      url: null
+      url: ELASTICSEARCH_URL
   existingSecret:
     # -- Alternatively, provide elasticsearch credentials via an existing secret
     name: null

From 75436f829b16f19f51f98613ab16344698706c13 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 18:21:08 +0200
Subject: [PATCH 11/15] add tests

---
 .../tests/liveindexing-deployment_test.yaml   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index 7cc1c4d3..34388bad 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -16,7 +16,7 @@ tests:
     template: liveindexing-deployment.yaml
     asserts:
       - equal:
-          path: data.SPRING_ELASTICSEARCH_REST_URIS
+          path: data.ELASTICSEARCH_URL
           value: http://elasticsearch-master:9200
         template: configmap-elasticsearch.yaml
       - contains:
@@ -27,6 +27,14 @@ tests:
               configMapKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-mq
                 key: BROKER_URL
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SPRING_ELASTICSEARCH_REST_URIS
+            valueFrom:
+              configMapKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-es
+                key: ELASTICSEARCH_URL
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -66,6 +74,10 @@ tests:
     template: liveindexing-deployment.yaml
     set:
       searchIndex:
+        existingConfigMap:
+          name: escm
+          keys:
+            url: ESURL
         existingSecret:
           name: nooneknows
           keys:
@@ -93,6 +105,14 @@ tests:
           path: data.SFS_URL
           value: http://sfs/alfresco/api/-default-/private/sfs/versions/1/file/
         template: configmap-ats.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SPRING_ELASTICSEARCH_REST_URIS
+            valueFrom:
+              configMapKeyRef:
+                name: escm
+                key: ESURL
       - contains:
           path: spec.template.spec.containers[0].env
           content:

From ec1cb132183dddcfc503a5ef256e3ac142df42d1 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 18:44:28 +0200
Subject: [PATCH 12/15] update dependency lock file

---
 charts/alfresco-search-enterprise/Chart.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/alfresco-search-enterprise/Chart.lock b/charts/alfresco-search-enterprise/Chart.lock
index 94fa0c44..cd9526ab 100644
--- a/charts/alfresco-search-enterprise/Chart.lock
+++ b/charts/alfresco-search-enterprise/Chart.lock
@@ -8,5 +8,5 @@ dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.17.3
-digest: sha256:d1d6c8303e0953b98f5e315fdcf120bc037f227843e785df66abd68e3150ea90
-generated: "2023-10-19T19:42:24.344873+02:00"
+digest: sha256:add38efb79f9791c5d302b13ed108b74adb77fdbffac66a7d6ce7fa9df05fa21
+generated: "2023-10-20T18:43:51.870175+02:00"

From 687451ef7ca658478a5ae9fcad8bf8de90225669 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 20 Oct 2023 18:53:56 +0200
Subject: [PATCH 13/15] bump search enterprise chart to 3.0.0-alpha.6

---
 charts/alfresco-search-enterprise/Chart.yaml | 2 +-
 charts/alfresco-search-enterprise/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
index b3818ed4..68101283 100644
--- a/charts/alfresco-search-enterprise/Chart.yaml
+++ b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 3.0.0-alpha.5
+version: 3.0.0-alpha.6
 appVersion: 3.3.1
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 11864819..532c7831 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.0.0-alpha.5](https://img.shields.io/badge/Version-3.0.0--alpha.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square)
+![Version: 3.0.0-alpha.6](https://img.shields.io/badge/Version-3.0.0--alpha.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 

From 91f2c121e9b7e2e9c2ee0d0efdec7e8ecd09940f Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Mon, 23 Oct 2023 09:53:22 +0200
Subject: [PATCH 14/15] review comments

---
 charts/alfresco-search-enterprise/README.md            |  6 +++---
 .../templates/configmap-elasticsearch.yaml             |  2 +-
 .../templates/secret-elasticsearch.yaml                |  4 ++--
 .../tests/liveindexing-deployment_test.yaml            |  8 ++++----
 .../tests/reindexing-job_test.yaml                     |  4 ++--
 .../tests/secret-elasticsearch_test.yaml               | 10 +++++-----
 charts/alfresco-search-enterprise/values.yaml          |  6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 532c7831..94c4fce8 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -82,10 +82,10 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
-| searchIndex.existingConfigMap.keys.url | string | `"ELASTICSEARCH_URL"` | Key within the configmap holding the URL of the elasticsearch service |
+| searchIndex.existingConfigMap.keys.url | string | `"SEARCH_URL"` | Key within the configmap holding the URL of the elasticsearch service |
 | searchIndex.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
-| searchIndex.existingSecret.keys.password | string | `"ELASTICSEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
-| searchIndex.existingSecret.keys.username | string | `"ELASTICSEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
+| searchIndex.existingSecret.keys.password | string | `"SEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
+| searchIndex.existingSecret.keys.username | string | `"SEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
 | searchIndex.existingSecret.name | string | `nil` | Alternatively, provide elasticsearch credentials via an existing secret |
 | searchIndex.host | string | `nil` | The host where the elasticsearch service is available |
 | searchIndex.password | string | `nil` | The password required to access the elasticsearch service, if any |
diff --git a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
index 31561c12..aaeb0ec2 100644
--- a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
@@ -11,5 +11,5 @@ data:
   {{- $esProtocol := required $reqMsg .Values.searchIndex.protocol }}
   {{- $esHost := required $reqMsg .Values.searchIndex.host }}
   {{- $esPort := required $reqMsg .Values.searchIndex.port }}
-  ELASTICSEARCH_URL: {{ printf "%s://%s:%v" $esProtocol $esHost $esPort }}
+  SEARCH_URL: {{ printf "%s://%s:%v" $esProtocol $esHost $esPort }}
 {{- end }}
diff --git a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
index 9b2c58b3..50d39f3a 100644
--- a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 type: Opaque
 data:
-  ELASTICSEARCH_USERNAME: {{ .user | default "" | b64enc | quote }}
-  ELASTICSEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
+  SEARCH_USERNAME: {{ .username | default "" | b64enc | quote }}
+  SEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
 {{- end }}
 {{- end }}
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index 34388bad..c13d2442 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -16,7 +16,7 @@ tests:
     template: liveindexing-deployment.yaml
     asserts:
       - equal:
-          path: data.ELASTICSEARCH_URL
+          path: data.SEARCH_URL
           value: http://elasticsearch-master:9200
         template: configmap-elasticsearch.yaml
       - contains:
@@ -34,7 +34,7 @@ tests:
             valueFrom:
               configMapKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-es
-                key: ELASTICSEARCH_URL
+                key: SEARCH_URL
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -42,7 +42,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-es
-                key: ELASTICSEARCH_USERNAME
+                key: SEARCH_USERNAME
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -50,7 +50,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-es
-                key: ELASTICSEARCH_PASSWORD
+                key: SEARCH_PASSWORD
       - contains:
           path: spec.template.spec.containers[0].env
           content:
diff --git a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
index c245816d..6de4bb0f 100644
--- a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
@@ -123,7 +123,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-es
-                key: ELASTICSEARCH_USERNAME
+                key: SEARCH_USERNAME
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -131,7 +131,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-es
-                key: ELASTICSEARCH_PASSWORD
+                key: SEARCH_PASSWORD
 
   - it: should not be present when disabled
     set:
diff --git a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
index e8f2119f..b31c292d 100644
--- a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
@@ -6,23 +6,23 @@ tests:
   - it: should have empty credentials as default
     asserts:
       - equal:
-          path: data.ELASTICSEARCH_USERNAME
+          path: data.SEARCH_USERNAME
           value: ""
       - equal:
-          path: data.ELASTICSEARCH_PASSWORD
+          path: data.SEARCH_PASSWORD
           value: ""
 
   - it: should have credentials populated when credentials are set
     set:
       searchIndex:
-          user: admin
+          username: admin
           password: letmein
     asserts:
       - equal:
-          path: data.ELASTICSEARCH_USERNAME
+          path: data.SEARCH_USERNAME
           value: YWRtaW4=
       - equal:
-          path: data.ELASTICSEARCH_PASSWORD
+          path: data.SEARCH_PASSWORD
           value: bGV0bWVpbg==
 
   - it: should not have a secret when existingSecret is set
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 57105aac..0fafb3b3 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -163,15 +163,15 @@ searchIndex:
     name: null
     keys:
       # -- Key within the configmap holding the URL of the elasticsearch service
-      url: ELASTICSEARCH_URL
+      url: SEARCH_URL
   existingSecret:
     # -- Alternatively, provide elasticsearch credentials via an existing secret
     name: null
     keys:
       # -- Key within the secret that holds the elasticsearch username
-      username: ELASTICSEARCH_USERNAME
+      username: SEARCH_USERNAME
       # -- Key within the secret that holds the elasticsearch password
-      password: ELASTICSEARCH_PASSWORD
+      password: SEARCH_PASSWORD
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
 

From 95f05104d27139b7e5844aadd7df1929805aa005 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Mon, 23 Oct 2023 10:21:41 +0200
Subject: [PATCH 15/15] also rename searchIndex to search for consistency with
 other charts

---
 charts/alfresco-search-enterprise/README.md   | 18 ++++++-------
 .../ci/default-values.yaml                    |  6 ++---
 .../templates/_helpers-elasticsearch.tpl      |  4 +--
 .../templates/configmap-elasticsearch.yaml    | 12 +++++----
 .../templates/secret-elasticsearch.yaml       |  2 +-
 .../tests/liveindexing-deployment_test.yaml   |  2 +-
 .../tests/secret-elasticsearch_test.yaml      |  4 +--
 .../tests/values/embedded-charts-values.yaml  |  6 ++---
 charts/alfresco-search-enterprise/values.yaml | 26 ++++++++-----------
 9 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 94c4fce8..4af9ca17 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -82,16 +82,14 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | resources.limits.memory | string | `"2048Mi"` |  |
 | resources.requests.cpu | string | `"0.5"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
-| searchIndex.existingConfigMap.keys.url | string | `"SEARCH_URL"` | Key within the configmap holding the URL of the elasticsearch service |
-| searchIndex.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
-| searchIndex.existingSecret.keys.password | string | `"SEARCH_PASSWORD"` | Key within the secret that holds the elasticsearch password |
-| searchIndex.existingSecret.keys.username | string | `"SEARCH_USERNAME"` | Key within the secret that holds the elasticsearch username |
-| searchIndex.existingSecret.name | string | `nil` | Alternatively, provide elasticsearch credentials via an existing secret |
-| searchIndex.host | string | `nil` | The host where the elasticsearch service is available |
-| searchIndex.password | string | `nil` | The password required to access the elasticsearch service, if any |
-| searchIndex.port | string | `nil` | The port where the elasticsearch service is available |
-| searchIndex.protocol | string | `nil` | Valid values are http or https |
-| searchIndex.user | string | `nil` | The username required to access the elasticsearch service, if any |
+| search.existingConfigMap.keys.url | string | `"SEARCH_URL"` | Key within the configmap holding the URL of the search/indexing service |
+| search.existingConfigMap.name | string | `nil` | Alternatively, provide search/indexing service connection details via an existing configmap |
+| search.existingSecret.keys.password | string | `"SEARCH_PASSWORD"` | Key within the secret that holds the search/indexing password |
+| search.existingSecret.keys.username | string | `"SEARCH_USERNAME"` | Key within the secret that holds the search/indexing username |
+| search.existingSecret.name | string | `nil` | Alternatively, provide search/indexing credentials via an existing secret |
+| search.password | string | `nil` | The password required to access the search/indexing service, if any |
+| search.url | string | `nil` | The URL where the search/indexing service is available |
+| search.user | string | `nil` | The username required to access the search/indexing service, if any |
 | securityContext | object | `{}` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
diff --git a/charts/alfresco-search-enterprise/ci/default-values.yaml b/charts/alfresco-search-enterprise/ci/default-values.yaml
index 79eb8c5a..7508ae78 100644
--- a/charts/alfresco-search-enterprise/ci/default-values.yaml
+++ b/charts/alfresco-search-enterprise/ci/default-values.yaml
@@ -15,10 +15,8 @@ resources:
   limits:
     cpu: "1"
     memory: "1Gi"
-searchIndex:
-  protocol: http
-  host: elasticsearch-master
-  port: 9200
+search:
+  url: http://elasticsearch-master:9200
 elasticsearch:
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
diff --git a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
index 635d497c..ff3ff2d0 100644
--- a/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
+++ b/charts/alfresco-search-enterprise/templates/_helpers-elasticsearch.tpl
@@ -5,7 +5,7 @@ Usage: include "alfresco-search-enterprise.config.spring.es.env" $
 */}}
 {{- define "alfresco-search-enterprise.config.spring.es.env" -}}
 {{- $esCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" (.Values.nameOverride | default .Chart.Name) "es")) "Chart" .Chart "Release" .Release }}
-{{- with .Values.searchIndex }}
+{{- with .Values.search }}
 {{- $esCm := coalesce .existingConfigMap.name (include "alfresco-search-enterprise.fullname" $esCtx) }}
 - name: SPRING_ELASTICSEARCH_REST_URIS
   valueFrom:
@@ -22,7 +22,7 @@ Usage: include "alfresco-search-enterprise.config.spring.envCredentials" $
 */}}
 {{- define "alfresco-search-enterprise.config.spring.envCredentials" -}}
 {{- $esCtx := dict "Values" (dict "nameOverride" (printf "%s-%s" (.Values.nameOverride | default .Chart.Name) "es")) "Chart" .Chart "Release" .Release }}
-{{- with .Values.searchIndex }}
+{{- with .Values.search }}
 {{- $esSecret := coalesce .existingSecret.name (include "alfresco-search-enterprise.fullname" $esCtx) }}
 - name: SPRING_ELASTICSEARCH_REST_USERNAME
   valueFrom:
diff --git a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
index aaeb0ec2..4636ac26 100644
--- a/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/configmap-elasticsearch.yaml
@@ -1,4 +1,5 @@
-{{- if not .Values.searchIndex.existingConfigMap.name }}
+{{- with .Values.search }}
+{{- if not .existingConfigMap.name }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,9 +8,10 @@ metadata:
   labels:
     {{- include "alfresco-search-enterprise.labels" $ | nindent 4 }}
 data:
-  {{- $reqMsg := "Please provide elasticsearch connection details as .searchIndex values or using an .searchIndex.existingConfigMap." }}
-  {{- $esProtocol := required $reqMsg .Values.searchIndex.protocol }}
-  {{- $esHost := required $reqMsg .Values.searchIndex.host }}
-  {{- $esPort := required $reqMsg .Values.searchIndex.port }}
+  {{- $reqMsg := "Please provide elasticsearch connection details as .search.url values or using an .search.existingConfigMap." }}
+  {{- $esProtocol := required $reqMsg (include "alfresco-common.url.scheme" .url) }}
+  {{- $esHost := required $reqMsg (include "alfresco-common.url.host" .url) }}
+  {{- $esPort := required $reqMsg (include "alfresco-common.url.port" .url) }}
   SEARCH_URL: {{ printf "%s://%s:%v" $esProtocol $esHost $esPort }}
 {{- end }}
+{{- end }}
diff --git a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
index 50d39f3a..98f25cbc 100644
--- a/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
+++ b/charts/alfresco-search-enterprise/templates/secret-elasticsearch.yaml
@@ -1,4 +1,4 @@
-{{- with .Values.searchIndex }}
+{{- with .Values.search }}
 {{- if not .existingSecret.name }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index c13d2442..a3a29a68 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -73,7 +73,7 @@ tests:
     values: *testvalues
     template: liveindexing-deployment.yaml
     set:
-      searchIndex:
+      search:
         existingConfigMap:
           name: escm
           keys:
diff --git a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
index b31c292d..0b21e8d9 100644
--- a/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/secret-elasticsearch_test.yaml
@@ -14,7 +14,7 @@ tests:
 
   - it: should have credentials populated when credentials are set
     set:
-      searchIndex:
+      search:
           username: admin
           password: letmein
     asserts:
@@ -27,7 +27,7 @@ tests:
 
   - it: should not have a secret when existingSecret is set
     set:
-      searchIndex:
+      search:
         existingSecret:
           name: whatever
     asserts:
diff --git a/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml b/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
index ce5a58a1..12e0f9ad 100644
--- a/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
+++ b/charts/alfresco-search-enterprise/tests/values/embedded-charts-values.yaml
@@ -1,9 +1,7 @@
 messageBroker:
   url: tcp://localhost:61616
-searchIndex:
-  host: elasticsearch-master
-  protocol: http
-  port: 9200
+search:
+  url: http://elasticsearch-master:9200
 ats:
   transform_url: http://transform
   sfs_url: http://sfs
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 0fafb3b3..fd13ad82 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -146,31 +146,27 @@ messageBroker:
     keys:
       username: BROKER_USERNAME
       password: BROKER_PASSWORD
-searchIndex:
-  # -- The host where the elasticsearch service is available
-  host: null
-  # -- The port where the elasticsearch service is available
-  port: null
-  # -- Valid values are http or https
-  protocol: null
-  # -- The username required to access the elasticsearch service, if any
+search:
+  # -- The URL where the search/indexing service is available
+  url: null
+  # -- The username required to access the search/indexing service, if any
   user: null
-  # -- The password required to access the elasticsearch service, if any
+  # -- The password required to access the search/indexing service, if any
   password: null
   existingConfigMap:
-    # -- Alternatively, provide message broker connection details via an existing
-    # configmap
+    # -- Alternatively, provide search/indexing service connection details via
+    # an existing configmap
     name: null
     keys:
-      # -- Key within the configmap holding the URL of the elasticsearch service
+      # -- Key within the configmap holding the URL of the search/indexing service
       url: SEARCH_URL
   existingSecret:
-    # -- Alternatively, provide elasticsearch credentials via an existing secret
+    # -- Alternatively, provide search/indexing credentials via an existing secret
     name: null
     keys:
-      # -- Key within the secret that holds the elasticsearch username
+      # -- Key within the secret that holds the search/indexing username
       username: SEARCH_USERNAME
-      # -- Key within the secret that holds the elasticsearch password
+      # -- Key within the secret that holds the search/indexing password
       password: SEARCH_PASSWORD
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret