From ba5b4ec161d22377d10587cda052565454c0ae57 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 9 Dec 2024 16:47:55 +0100
Subject: [PATCH] try some workarounds

---
 helm/alfresco-content-services/README.md   |  9 ++++++++-
 helm/alfresco-content-services/values.yaml | 11 ++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
index bb4ba385d..7cceb371a 100644
--- a/helm/alfresco-content-services/README.md
+++ b/helm/alfresco-content-services/README.md
@@ -252,10 +252,14 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | 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.protocol | string | `"http"` |  |
 | elasticsearch-audit.replicas | int | `1` |  |
+| elasticsearch-audit.secret.enabled | bool | `false` |  |
 | elasticsearch.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
 | elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster |
+| elasticsearch.protocol | string | `"http"` |  |
 | elasticsearch.replicas | int | `1` |  |
+| elasticsearch.secret.enabled | bool | `false` |  |
 | 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 |
@@ -280,7 +284,10 @@ 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.elasticsearchCertificateAuthoritiesFile | string | `""` |  |
+| kibana-audit.elasticsearchCertificateSecret | string | `""` |  |
+| kibana-audit.elasticsearchCredentialSecret | string | `""` |  |
+| kibana-audit.elasticsearchHosts | string | `""` | Makes sure there is no default elasticsearch hosts, certs and secrets defined |
 | kibana-audit.enabled | bool | `true` |  |
 | kibana-audit.extraEnvs[0].name | string | `"SERVER_BASEPATH"` |  |
 | kibana-audit.extraEnvs[0].value | string | `"/kibana"` |  |
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
index 463e0ab43..da4433170 100644
--- a/helm/alfresco-content-services/values.yaml
+++ b/helm/alfresco-content-services/values.yaml
@@ -551,6 +551,9 @@ elasticsearch:
   enabled: true
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
+  secret:
+    enabled: false
+  protocol: http
 elasticsearch-audit:
   # -- Enables the embedded elasticsearch cluster for alfresco-audit-storage
   enabled: true
@@ -558,6 +561,9 @@ elasticsearch-audit:
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
   clusterName: elasticsearch-aas
+  secret:
+    enabled: false
+  protocol: http
   extraEnvs:
     - name: ELASTIC_USERNAME
       valueFrom:
@@ -598,8 +604,11 @@ alfresco-audit-storage:
 kibana-audit:
   enabled: true
   healthCheckPath: "/kibana/app/kibana"
-  # -- Makes sure there is no default elasticsearch hosts defined
+  # -- Makes sure there is no default elasticsearch hosts, certs and secrets defined
   elasticsearchHosts: ""
+  elasticsearchCertificateSecret: ""
+  elasticsearchCertificateAuthoritiesFile: ""
+  elasticsearchCredentialSecret: ""
   # All of the values has to be set there to escape the issue with overriding the values
   extraEnvs:
     - name: SERVER_BASEPATH