[LIASCW-47]: reworked global overrides

Author: Brobrechts

README.md

@@ -1347,16 +1347,23 @@ ingress:
 * Default: `true`
 * Description: When enabled, and if the elastic index does not exist, it will be created automatically.
 
-#### `global.elasticsearch.indexName`
+#### `elastic.elasticsearch.indexName`
 
 * Required: false
-* Default: `"alfresco-{{ .Release.Namespace }}"`
-* Description: This is a global setting for the indexname. The default name is dynamic, it is based on your namespace name. 
+* Default: `"alfresco-{{ .Release.Namespace }}`
+* Description: This is the setting for the elastic index name. The default name is dynamic, it is based on your namespace name.
 * This prevents potential issues when using a shared elastic environment.
+> [!NOTE]  
+> The global value lobal.elasticsearch.indexName takes precedence when set.
 
+#### `global.elasticsearch.indexName`
 
-> [!WARNING]  
-> This is a global setting that other charts (or this one) picks up, double check other dependant charts when setting it.
+* Required: false
+* Default: `"alfresco-{{ .Release.Namespace }}"`
+* Description: This is a global setting for the elastic index name. The default name is dynamic, it is based on your namespace name. 
+* This prevents potential issues when using a shared elastic environment.
+> [!NOTE]  
+> This setting will take precedence over elastic.elasticsearch.indexName when set
 
 ### SOLR
 

xenit-alfresco/templates/acs/acs-config.yaml

@@ -52,7 +52,7 @@ data:
   GLOBAL_index.subsystem.name: "elasticsearch"
   GLOBAL_elasticsearch.host: {{ .Values.elastic.host | quote }}
   GLOBAL_elasticsearch.port: {{ .Values.elastic.port | quote }}
-  GLOBAL_elasticsearch.indexName: {{ (((.Values.global).elasticsearch).indexName) | default (printf "alfresco-%s" .Release.Namespace ) | quote }}
+  GLOBAL_elasticsearch.indexName: {{ coalesce (((.Values.global).elasticsearch).indexName)  (((.Values.elastic).elasticsearch).indexName) (printf "alfresco-%s" .Release.Namespace ) | quote }}
   GLOBAL_elasticsearch.createIndexIfNotExists: {{ .Values.elastic.createIndexIfNotExists | quote }}
   {{- else }}
   GLOBAL_index.subsystem.name: "noindex"