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

docker-compose/pre-release-compose.yaml

@@ -181,7 +181,7 @@ services:
       retries: 3
       start_period: 5s
   elasticsearch:
-    image: elasticsearch:7.17.3
+    image: elasticsearch:8.16.1
     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:8.16.1
     mem_limit: 1g
     environment:
       - ELASTICSEARCH_HOSTS=http://elasticsearch:9200

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

helm/alfresco-content-services/README.md

@@ -6,7 +6,7 @@ grand_parent: Helm
 
 # alfresco-content-services
 
-![Version: 9.0.0-alpha.0](https://img.shields.io/badge/Version-9.0.0--alpha.0-informational?style=flat-square) ![AppVersion: 23.4.0](https://img.shields.io/badge/AppVersion-23.4.0-informational?style=flat-square)
+![Version: 9.0.0-alpha.1](https://img.shields.io/badge/Version-9.0.0--alpha.1-informational?style=flat-square) ![AppVersion: 23.4.0](https://img.shields.io/badge/AppVersion-23.4.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Content Services
 
@@ -26,19 +26,17 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-control-center(alfresco-adf-app) | 0.2.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-digital-workspace(alfresco-adf-app) | 0.2.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 3.0.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-audit-storage | 0.1.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-audit-storage | 0.2.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 3.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 2.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.8.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 4.2.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 4.3.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 5.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 1.2.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 7.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 2.1.2 |
-| https://helm.elastic.co | elasticsearch | 7.17.3 |
-| https://helm.elastic.co | elasticsearch-audit(elasticsearch) | 7.17.3 |
-| https://helm.elastic.co | kibana-audit(kibana) | 7.17.3 |
+| oci://registry-1.docker.io/bitnamicharts | elasticsearch | 21.4.1 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |
 
@@ -223,7 +221,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | database.user | string | `nil` | External Postgresql database user |
 | dtas.additionalArgs[0] | string | `"--tb=short"` |  |
 | dtas.config.assertions.aas.audit_host | string | `"http://acs-alfresco-audit-storage:8081"` |  |
-| dtas.config.assertions.aas.elasticsearch_host | string | `"http://elasticsearch-aas-master:9200"` |  |
+| dtas.config.assertions.aas.elasticsearch_host | string | `"http://acs-elasticsearch:9200"` |  |
 | dtas.config.assertions.acs.edition | string | `"Enterprise"` |  |
 | dtas.config.assertions.acs.identity | bool | `false` |  |
 | dtas.config.assertions.acs.modules[0].id | string | `"org.alfresco.integrations.google.docs"` |  |
@@ -241,28 +239,29 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | dtas.image.pullPolicy | string | `"IfNotPresent"` |  |
 | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` |  |
 | dtas.image.tag | string | `"v1.6.0"` |  |
-| elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
-| elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` |  |
-| elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage |
-| elasticsearch-audit.extraEnvs[0].name | string | `"ELASTIC_USERNAME"` |  |
-| elasticsearch-audit.extraEnvs[0].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_USERNAME"` |  |
-| elasticsearch-audit.extraEnvs[0].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| elasticsearch-audit.extraEnvs[1].name | string | `"ELASTIC_PASSWORD"` |  |
-| elasticsearch-audit.extraEnvs[1].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` |  |
-| elasticsearch-audit.extraEnvs[1].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| elasticsearch-audit.ingress.enabled | bool | `false` | toggle deploying elasticsearch-audit ingress for more details about configuration check https://github.com/elastic/helm-charts/blob/main/elasticsearch/values.yaml#L255 |
-| elasticsearch-audit.nameOverride | string | `"elasticsearch-aas"` |  |
-| elasticsearch-audit.replicas | int | `1` |  |
-| elasticsearch.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
+| elasticsearch.coordinating.replicaCount | int | `0` |  |
+| elasticsearch.data.replicaCount | int | `0` |  |
 | elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster |
-| elasticsearch.replicas | int | `1` |  |
+| elasticsearch.image.tag | string | `"7.17.26"` |  |
+| elasticsearch.ingest.replicaCount | int | `0` |  |
+| elasticsearch.ingress.enabled | bool | `false` | toggle deploying elasticsearch-audit ingress for more details about configuration check https://github.com/bitnami/charts/blob/main/bitnami/elasticsearch/values.yaml#L366 |
+| elasticsearch.kibana.configuration.server.basePath | string | `"/kibana"` |  |
+| elasticsearch.kibana.configuration.server.publicBaseUrl | string | `"http://localhost/kibana"` |  |
+| elasticsearch.kibana.configuration.server.rewriteBasePath | bool | `true` |  |
+| elasticsearch.kibana.image.tag | string | `"7.17.26"` |  |
+| elasticsearch.kibana.ingress.enabled | bool | `true` |  |
+| elasticsearch.kibana.ingress.hostname | string | `"*"` |  |
+| elasticsearch.kibana.ingress.ingressClassName | string | `"nginx"` |  |
+| elasticsearch.kibana.ingress.path | string | `"/kibana"` |  |
+| elasticsearch.master.masterOnly | bool | `false` |  |
+| elasticsearch.master.replicaCount | int | `1` |  |
 | global.alfrescoRegistryPullSecrets | string | `nil` | If a private image registry a secret can be defined and passed to kubernetes, see: https://github.com/Alfresco/acs-deployment/blob/a924ad6670911f64f1bba680682d266dd4ea27fb/docs/helm/eks-deployment.md#docker-registry-secret |
 | global.auditIndex.existingSecretName | string | `nil` | Name of an existing secret that contains AUDIT_ELASTICSEARCH_USERNAME and AUDIT_ELASTICSEARCH_PASSWORD keys. |
-| global.auditIndex.password | string | `nil` | Elasticsearch password |
-| global.auditIndex.publicBaseUrl | string | `nil` | Base url for kibana environment variable `SERVER_PUBLICBASEURL`  |
+| global.auditIndex.password | string | `nil` | set password for authentication against the external elasticsearch service for audit indexing |
 | global.auditIndex.secretName | string | `"alfresco-aas-elasticsearch-secret"` | Name of the secret managed by this chart |
-| global.auditIndex.url | string | `nil` | Elasticsearch URL |
-| global.auditIndex.username | string | `nil` | Elasticsearch username |
+| global.auditIndex.url | string | `nil` | set this URL if you have an external search service for audit indexing |
+| global.auditIndex.username | string | `nil` | set usernname for authentication against the external elasticsearch service for audit indexing |
+| global.kibanaEnabled | bool | `true` |  |
 | global.known_urls | list | `["https://localhost","http://localhost"]` | list of trusted URLs. URLs a re used to configure Cross-origin protections Also the first entry is considered the main hosting domain of the platform. |
 | global.mail | object | `{"host":null,"password":null,"port":587,"protocol":"smtp","smtp":{"auth":true,"starttls":{"enable":true}},"smtps":{"auth":true},"username":"anonymous"}` | For a full information of configuring the outbound email system, see https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Configure/Email/Configure-Inbound-and-Outbound-Email/Manage-Outbound-Emails |
 | global.mail.host | string | `nil` | SMTP server to use for the system to send outgoing email |
@@ -280,28 +279,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | global.strategy.rollingUpdate.maxUnavailable | int | `0` |  |
 | infrastructure.configMapName | string | `"alfresco-infrastructure"` |  |
 | keda.components | list | `[]` | The list of components that will be scaled by KEDA (chart names) |
-| kibana-audit.elasticsearchHosts | string | `""` | Makes sure there is no default elasticsearch hosts defined |
-| kibana-audit.enabled | bool | `true` |  |
-| kibana-audit.extraEnvs[0].name | string | `"SERVER_BASEPATH"` |  |
-| kibana-audit.extraEnvs[0].value | string | `"/kibana"` |  |
-| kibana-audit.extraEnvs[1].name | string | `"SERVER_REWRITEBASEPATH"` |  |
-| kibana-audit.extraEnvs[1].value | string | `"true"` |  |
-| kibana-audit.extraEnvs[2].name | string | `"ELASTICSEARCH_HOSTS"` |  |
-| kibana-audit.extraEnvs[2].valueFrom.configMapKeyRef.key | string | `"AUDIT_ELASTICSEARCH_URL"` |  |
-| kibana-audit.extraEnvs[2].valueFrom.configMapKeyRef.name | string | `"alfresco-infrastructure"` |  |
-| kibana-audit.extraEnvs[3].name | string | `"SERVER_PUBLICBASEURL"` |  |
-| kibana-audit.extraEnvs[3].valueFrom.configMapKeyRef.key | string | `"AUDIT_SERVER_PUBLICBASEURL"` |  |
-| kibana-audit.extraEnvs[3].valueFrom.configMapKeyRef.name | string | `"alfresco-infrastructure"` |  |
-| kibana-audit.extraEnvs[4].name | string | `"ELASTICSEARCH_USERNAME"` |  |
-| kibana-audit.extraEnvs[4].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_USERNAME"` |  |
-| kibana-audit.extraEnvs[4].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| kibana-audit.extraEnvs[5].name | string | `"ELASTICSEARCH_PASSWORD"` |  |
-| kibana-audit.extraEnvs[5].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` |  |
-| kibana-audit.extraEnvs[5].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| kibana-audit.healthCheckPath | string | `"/kibana/app/kibana"` |  |
-| kibana-audit.ingress.enabled | bool | `true` |  |
-| kibana-audit.ingress.hosts[0].paths[0].path | string | `"/kibana"` |  |
-| kibana-audit.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | messageBroker.brokerName | string | `nil` | name of the message broker as set in the Broker configuration |
 | messageBroker.existingSecretName | string | `nil` | Name of an existing secret that contains BROKER_USERNAME and BROKER_PASSWORD keys. and optionally the credentials to the web console (can be the same as broker access). |
 | messageBroker.password | string | `nil` | External message broker password |

helm/alfresco-content-services/community_values.yaml

@@ -59,9 +59,5 @@ alfresco-connector-ms365:
   enabled: false
 alfresco-connector-msteams:
   enabled: false
-elasticsearch-audit:
-  enabled: false
-kibana-audit:
-  enabled: false
 alfresco-audit-storage:
   enabled: false

helm/alfresco-content-services/pre-release_values.yaml

@@ -78,6 +78,12 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.4-A4
+elastisearch:
+  image:
+    tag: 7.17.26
+  kibana:
+    image:
+      tag: 7.17.26
 alfresco-audit-storage:
   image:
     tag: 1.0.0

helm/alfresco-content-services/templates/config-infrastructure.yaml

@@ -30,9 +30,9 @@ data:
     {{- else if eq "elasticsearch" $search_flavor }}
       {{- with .Values.elasticsearch }}
         {{- if .enabled }}
+          {{- $esHost := printf "%s-%s" $.Release.Name (($.Values.global.elasticsearch).service.name | default "elasticsearch") }}
+          {{- $esPort := ($.Values.global.elasticsearch).service.ports.restApi | default 9200 }}
           {{- $esProto := .protocol | default "http" }}
-          {{- $esHost := printf "%s-%s" (.clusterName | default "elasticsearch") (.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" }}
@@ -73,18 +73,17 @@ data:
     {{- if .Values.global.auditIndex.url }}
       {{- $elasticsearch_audit_url = .Values.global.auditIndex.url }}
     {{- else }}
-      {{- with (index .Values "elasticsearch-audit") }}
+      {{- with (index .Values "elasticsearch") }}
         {{- if .enabled }}
+          {{- $auditEsHost := printf "%s-%s" $.Release.Name (($.Values.global.elasticsearch).service.name | default "elasticsearch") }}
+          {{- $auditEsPort := ($.Values.global.elasticsearch).service.ports.restApi | default 9200 }}
           {{- $auditEsProto := .protocol | default "http" }}
-          {{- $auditEsHost := printf "%s-%s" (.clusterName | default "elasticsearch") (.nodeGroup | default "master") }}
-          {{- $auditEsPort := .port | default 9200 }}
           {{- $elasticsearch_audit_url = coalesce $.Values.global.auditIndex.url (printf "%s://%s:%v" $auditEsProto $auditEsHost $auditEsPort) }}
         {{- else if index $.Values "alfresco-audit-storage" "enabled" }}
-          {{- fail "Chart is configured to use Alfresco Audit Storage but no index backend has been provided. Set one using either global.auditIndex.url or elasticsearch-audit.enabled" }}
+          {{- fail "Chart is configured to use Alfresco Audit Storage but no index backend has been provided. Set one using either global.auditIndex.url or elasticsearch.enabled" }}
         {{- end }}
       {{- end }}
     {{- end }}
     {{- printf "AUDIT_ELASTICSEARCH_URL: %s" $elasticsearch_audit_url | nindent 2 }}
     {{- printf "AUDIT_ELASTICSEARCH_HOST: %s" (include "alfresco-common.url.host" $elasticsearch_audit_url) | nindent 2 }}
     {{- printf "AUDIT_ELASTICSEARCH_PORT: %s" (include "alfresco-common.url.port" $elasticsearch_audit_url | quote) | nindent 2 }}
-  AUDIT_SERVER_PUBLICBASEURL: {{ .Values.global.auditIndex.publicBaseUrl | default "http://localhost/kibana" }}

helm/alfresco-content-services/templates/secret-aas-elasticearch.yaml → helm/alfresco-content-services/templates/secret-audit-elasticsearch.yaml

@@ -8,7 +8,7 @@ metadata:
     {{- include "alfresco-content-services.labels" $ | nindent 4 }}
 type: Opaque
 data:
-  AUDIT_ELASTICSEARCH_USERNAME: {{ .username | default "elastic" | b64enc | quote }}
-  AUDIT_ELASTICSEARCH_PASSWORD: {{ .password | default "elastic" | b64enc | quote }}
+  AUDIT_ELASTICSEARCH_USERNAME: {{ .username | default "" | b64enc | quote }}
+  AUDIT_ELASTICSEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
 {{- end }}
 {{- end }}