OPSEXP-2950 Prepare to update to Elasticsearch 8 by switching to the bitnami/elasticsearch chart

docker-compose/compose.yaml

@@ -181,7 +181,7 @@ services:
       retries: 3
       start_period: 5s
   elasticsearch:
-    image: elasticsearch:7.17.3
+    image: elasticsearch:7.17.26
     environment:
       - xpack.security.enabled=false
       - discovery.type=single-node
@@ -204,7 +204,7 @@ services:
       retries: 5
       start_period: 30s
   kibana:
-    image: kibana:7.17.3
+    image: kibana:7.17.26
     mem_limit: 1g
     environment:
       - ELASTICSEARCH_HOSTS=http://elasticsearch:9200

docker-compose/pre-release-compose.yaml

@@ -181,7 +181,7 @@ services:
       retries: 3
       start_period: 5s
   elasticsearch:
-    image: elasticsearch:7.17.3
+    image: elasticsearch:7.17.26
     environment:
       - xpack.security.enabled=false
       - discovery.type=single-node
@@ -204,7 +204,7 @@ services:
       retries: 5
       start_period: 30s
   kibana:
-    image: kibana:7.17.3
+    image: kibana:7.17.26
     mem_limit: 1g
     environment:
       - ELASTICSEARCH_HOSTS=http://elasticsearch:9200

docs/helm/examples/with-elasticsearch-auth.md

@@ -0,0 +1,69 @@
+---
+title: ACS with local elasticsearch cluster with auth enabled
+parent: Examples
+grand_parent: Helm
+---
+
+# Deploying Elasticsearch with Kibana and Authentication Enabled
+
+This guide demonstrates how to deploy Elasticsearch with Kibana and
+authentication enabled using the Alfresco ACS Deployment repository.  
+
+## Prerequisites
+
+Ensure you have the following:
+
+- Helm installed on your system.
+- Kubernetes cluster configured and running.
+
+## Steps to Deploy
+
+### 1. Create a Secret
+
+First, create a Kubernetes secret containing the credentials for Elasticsearch
+and Kibana. Customize the values as needed for your setup.
+
+```bash
+kubectl create secret generic elastic-search-secret \
+    --namespace=default \
+    --from-literal=elastic-user=elastic \
+    --from-literal=elasticsearch-password=alfresco \
+    --from-literal=kibana-password=alfrescokibana \
+    --from-literal=AUDIT_ELASTICSEARCH_USERNAME=elastic \
+    --from-literal=AUDIT_ELASTICSEARCH_PASSWORD=alfresco \
+    --from-literal=SEARCH_USERNAME=elastic \
+    --from-literal=SEARCH_PASSWORD=alfresco
+```
+
+### 2. Understand the Patch File
+
+Patch [file](../values/elasticsearch_auth_values.yaml) defines the configuration
+for enabling authentication and integrating Elasticsearch and Kibana with the
+Alfresco deployment. Update the patch file to match your requirements if
+necessary.
+
+### 3. Deploy the Infrastructure
+
+Deploy the ACS stack with the appropriate values files.
+
+```bash
+helm install acs ./helm/alfresco-content-services \
+    --set global.search.sharedSecret="$(openssl rand -hex 24)" \
+    --set global.known_urls=http://localhost \
+    --set global.alfrescoRegistryPullSecrets=quay-registry-secret \
+    --values docs/helm/values/local-dev_values.yaml \
+    --values docs/helm/values/elasticsearch_auth_values.yaml
+```
+
+## Accessing Kibana
+
+After the deployment is successful:
+
+1. Open your browser and navigate to: `http://localhost/kibana`
+
+2. Use the credentials specified in the secret to log in.
+
+   - **Username**: elastic
+   - **Password**: alfresco
+
+You should now have access to Kibana with Elasticsearch authentication enabled.

docs/helm/values/elasticsearch_auth_values.yaml

@@ -0,0 +1,34 @@
+global:
+  kibanaEnabled: true
+alfresco-repository:
+  configuration:
+    search:
+      existingSecret:
+        name: &secretName elastic-search-secret
+alfresco-audit-storage:
+  index:
+    existingSecret:
+      name: *secretName
+alfresco-search-enterprise:
+  search:
+    existingSecret:
+      name: *secretName
+elasticsearch:
+  security:
+    enabled: true
+    existingSecret: *secretName
+    tls:
+      restEncryption: false
+      autoGenerated: true
+      verificationMode: "none"
+  kibana:
+    elasticsearch:
+      security:
+        auth:
+          enabled: true
+          createSystemUser: true
+          elasticsearchPasswordSecret: *secretName
+          existingSecret: *secretName
+        tls:
+          enabled: false
+          verificationMode: "none"

docs/helm/values/local-dev_values.yaml

@@ -92,15 +92,30 @@ alfresco-search-enterprise:
       cpu: "1"
       memory: "1Gi"
 elasticsearch:
-  esJavaOpts: "-Xmx512m -Xms512m"
+  master:
+    resources:
+      requests:
+        cpu: "0.1"
+        memory: "512Mi"
+      limits:
+        cpu: "1"
+        memory: "1Gi"
+  kibana:
+    resources:
+      requests:
+        cpu: "0.1"
+        memory: "512Mi"
+      limits:
+        cpu: "1"
+        memory: "1Gi"
+share:
   resources:
     requests:
-      cpu: "100m"
-      memory: "512Mi"
+      cpu: "0.01"
+      memory: "256Mi"
     limits:
-      cpu: "1000m"
-      memory: "1Gi"
-share:
+      memory: "512Mi"
+alfresco-audit-storage:
   resources:
     requests:
       cpu: "0.01"

helm/alfresco-content-services/7.2.N_values.yaml

@@ -85,10 +85,6 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.4
-elasticsearch-audit:
-  enabled: false
-kibana-audit:
-  enabled: false
 alfresco-audit-storage:
   enabled: false
 dtas:

helm/alfresco-content-services/7.3.N_values.yaml

@@ -85,10 +85,6 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.4
-elasticsearch-audit:
-  enabled: false
-kibana-audit:
-  enabled: false
 alfresco-audit-storage:
   enabled: false
 dtas:

helm/alfresco-content-services/7.4.N_values.yaml

@@ -85,10 +85,6 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.4
-elasticsearch-audit:
-  enabled: false
-kibana-audit:
-  enabled: false
 alfresco-audit-storage:
   enabled: false
 dtas:

helm/alfresco-content-services/Chart.lock

@@ -31,7 +31,7 @@ dependencies:
   version: 7.0.0-alpha.0
 - name: alfresco-search-enterprise
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 4.2.0
+  version: 4.3.0-alpha.0
 - name: alfresco-connector-msteams
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 2.0.0-alpha.0
@@ -45,16 +45,10 @@ dependencies:
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.0.0
 - name: elasticsearch
-  repository: https://helm.elastic.co
-  version: 7.17.3
-- name: elasticsearch
-  repository: https://helm.elastic.co
-  version: 7.17.3
-- name: kibana
-  repository: https://helm.elastic.co
-  version: 7.17.3
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 21.4.1
 - name: alfresco-audit-storage
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 0.1.0
-digest: sha256:86c84fe4d02c8b094428b4015cb60496932c9825c2e93af080a261173e4b623a
-generated: "2024-12-10T18:02:25.499745+01:00"
+  version: 0.2.0-alpha.0
+digest: sha256:809e677e581430f219dbc1024c239aed0f62862493d27ec980f7ee078098b5c8
+generated: "2024-12-18T14:47:30.487767+01:00"

helm/alfresco-content-services/Chart.yaml

@@ -4,7 +4,7 @@
 # https://www.alfresco.com/platform/content-services-ecm/trial/download
 apiVersion: v2
 name: alfresco-content-services
-version: 9.0.0-alpha.0
+version: 9.0.0-alpha.1
 appVersion: 23.4.0
 description: A Helm chart for deploying Alfresco Content Services
 keywords:
@@ -61,7 +61,7 @@ dependencies:
     version: 7.0.0-alpha.0
     condition: alfresco-sync-service.enabled
   - name: alfresco-search-enterprise
-    version: 4.2.0
+    version: 4.3.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-search-enterprise.enabled
   - name: alfresco-connector-msteams
@@ -82,21 +82,11 @@ dependencies:
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-ai-transformer.enabled
   - name: elasticsearch
-    repository: https://helm.elastic.co
-    version: 7.17.3
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 21.4.1
     condition: elasticsearch.enabled
-  - name: elasticsearch
-    alias: elasticsearch-audit
-    repository: https://helm.elastic.co
-    version: 7.17.3
-    condition: elasticsearch-audit.enabled
-  - name: kibana
-    alias: kibana-audit
-    repository: https://helm.elastic.co
-    version: 7.17.3
-    condition: kibana-audit.enabled
   - name: alfresco-audit-storage
-    version: 0.1.0
+    version: 0.2.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-audit-storage.enabled
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4