Merge pull request #185 from xenit-eu/LIASCW-47

[LIASCW-47]: added elastic option

Author: Brobrechts

README.md

@@ -1318,13 +1318,63 @@ ingress:
 * Description: If you use an image that is not public. then you can create dockerconfigjson secrets on your cluster and
   reference them here.
 
+### Elastic
+
+#### `elastic.enabled`
+
+* Required: false
+* Default: `false`
+* Description: Enable or disable elastic search subsystem
+> [!IMPORTANT]  
+> Alfresco can only use one search subsystem at a time, if you still have SOLR enabled (which you -shouldn't- when enabling this option),
+> The helm chart will fail with an error message
+
+#### `elastic.host`
+
+* Required: false
+* Default: `elasticsearch`
+* Description: Host (service) name of elastic.
+
+#### `elastic.port`
+
+* Required: false
+* Default: `9200`
+* Description: Port of the elastic service.
+
+#### `elastic.createIndexIfNotExists`
+
+* Required: false
+* Default: `true`
+* Description: When enabled, and if the elastic index does not exist, it will be created automatically.
+
+#### `elastic.elasticsearch.indexName`
+
+* Required: false
+* 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 `global.elasticsearch.indexName` takes precedence when set.
+
+#### `global.elasticsearch.indexName`
+
+* 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
 
 #### `solr.enabled`
 
 * Required: false
 * Default: `true`
 * Description: Enable or disable the Solr
+> [!IMPORTANT]  
+> Alfresco can only use one search subsystem at a time, if you have ELASTIC enabled (which you -shouldn't- when enabling this option),
+> The helm chart will fail with an error message
 
 #### `solr.replicas`
 

helm_commands/helm_template.sh

@@ -0,0 +1 @@
+helm template --namespace test-namespace template-test ./xenit-alfresco/ --values ./xenit-alfresco/values.yaml --set ingress.host=template-test  ${@}

xenit-alfresco/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.11
+version: 0.8.14
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

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

@@ -1,3 +1,6 @@
+{{- if and .Values.elastic.enabled .Values.solr.enabled }}
+  {{ fail "Both SOLR and elastic search systems are enabled, you can only have 1 (or none) enabled." }}
+{{- end }}
 # Defines the properties required by the content repository
 apiVersion: v1
 kind: ConfigMap
@@ -9,9 +12,6 @@ metadata:
 data:
   DB_URL: {{ quote .Values.acs.dbUrl }}
   DB_DRIVER: {{ quote .Values.acs.dbDriver }}
-  {{- if .Values.solr.enabled }}
-  GLOBAL_solr.port: '30300'
-  {{- end }}
   {{- if .Values.share.enabled }}
   SHARE_HOST: {{ quote .Values.ingress.host }}
   SHARE_PORT: {{ quote .Values.acs.sharePort }}
@@ -45,7 +45,16 @@ data:
   GLOBAL_transform.service.enabled: 'false'
   {{- end }}
   GLOBAL_aos.baseUrlOverwrite: '{{ .Values.ingress.syncServiceHost }}://{{ .Values.ingress.host }}/alfresco/aos'
-  {{- if not .Values.solr.enabled }}
+  {{- if .Values.solr.enabled }}
+  GLOBAL_index.subsystem.name: "solr6"
+  GLOBAL_solr.port: '30300'
+  {{- else if .Values.elastic.enabled }}
+  GLOBAL_index.subsystem.name: "elasticsearch"
+  GLOBAL_elasticsearch.host: {{ .Values.elastic.host | quote }}
+  GLOBAL_elasticsearch.port: {{ .Values.elastic.port | 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"
   {{- end }}
   {{- if ((((.Values.acs).email).inbound).port) }}

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

@@ -27,6 +27,9 @@ spec:
     metadata:
       labels:
         app: acs
+        {{- if .Values.elastic.enabled }}
+        elasticsearch-client: true
+        {{- end }}
       annotations:
         checksum/acs-config: {{ include (print $.Template.BasePath "/acs/acs-config.yaml") . | sha256sum }}
         checksum/db-secret: {{ include (print $.Template.BasePath "/db-secret.yaml") . | sha256sum }}

xenit-alfresco/values.yaml

@@ -188,6 +188,11 @@ solr:
     successThreshold: 1
     timeoutSeconds: 10
 
+elastic:
+  enabled: false
+  host: "elasticsearch"
+  port: '9200'
+  createIndexIfNotExists: true
 transformServices:
   enabled: true
   sharedFileStore: