From d0725867c019f21881711a217be0b4fa80f49096 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Thu, 17 Oct 2024 21:18:59 +0200
Subject: [PATCH] disable ingress

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

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
index 6e706f528..46e892f74 100644
--- a/helm/alfresco-content-services/README.md
+++ b/helm/alfresco-content-services/README.md
@@ -246,7 +246,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | elasticsearchAudit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
 | elasticsearchAudit.clusterName | string | `"elasticsearch-aas"` |  |
 | elasticsearchAudit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage |
-| elasticsearchAudit.esConfig."elasticsearch.yml" | string | `"xpack.security.enabled: true\ndiscovery.type: single-node\ncluster.initial_master_nodes: \"\"\n"` |  |
 | elasticsearchAudit.extraEnvs[0].name | string | `"ELASTIC_USERNAME"` |  |
 | elasticsearchAudit.extraEnvs[0].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_USERNAME"` |  |
 | elasticsearchAudit.extraEnvs[0].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
@@ -254,7 +253,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | elasticsearchAudit.extraEnvs[1].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` |  |
 | elasticsearchAudit.extraEnvs[1].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
 | elasticsearchAudit.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` |  |
-| elasticsearchAudit.ingress.enabled | bool | `true` |  |
+| elasticsearchAudit.ingress.enabled | bool | `false` |  |
 | elasticsearchAudit.ingress.hosts[0].paths[0].path | string | `"/elasticsearch(/|$)(.*)"` |  |
 | elasticsearchAudit.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | elasticsearchAudit.nameOverride | string | `"elasticsearch-aas"` |  |
@@ -287,7 +286,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | kibana.enabled | bool | `true` |  |
 | kibana.extraEnvs | list | `[{"name":"SERVER_BASEPATH","value":"/kibana"},{"name":"SERVER_REWRITEBASEPATH","value":"true"},{"name":"ELASTICSEARCH_HOSTS","valueFrom":{"configMapKeyRef":{"key":"AUDIT_ELASTICSEARCH_URL","name":"alfresco-infrastructure"}}},{"name":"SERVER_PUBLICBASEURL","valueFrom":{"configMapKeyRef":{"key":"AUDIT_SERVER_PUBLICBASEURL","name":"alfresco-infrastructure"}}},{"name":"ELASTICSEARCH_USERNAME","valueFrom":{"secretKeyRef":{"key":"AUDIT_ELASTICSEARCH_USERNAME","name":"alfresco-aas-elasticsearch-secret"}}},{"name":"ELASTICSEARCH_PASSWORD","valueFrom":{"secretKeyRef":{"key":"AUDIT_ELASTICSEARCH_PASSWORD","name":"alfresco-aas-elasticsearch-secret"}}}]` | All of the values has to be set there to escape the issue with overriding the values |
 | kibana.healthCheckPath | string | `"/kibana/app/kibana"` |  |
-| kibana.ingress.enabled | bool | `true` |  |
+| kibana.ingress.enabled | bool | `false` |  |
 | kibana.ingress.hosts[0].paths[0].path | string | `"/kibana"` |  |
 | kibana.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | messageBroker.brokerName | string | `nil` | name of the message broker as set in the Broker configuration |
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
index 6d19956e3..643ee48de 100644
--- a/helm/alfresco-content-services/values.yaml
+++ b/helm/alfresco-content-services/values.yaml
@@ -569,13 +569,8 @@ elasticsearchAudit:
         secretKeyRef: 
           name: *aas_elasticsearch_secretName
           key: AUDIT_ELASTICSEARCH_PASSWORD
-  esConfig:
-    elasticsearch.yml: |
-      xpack.security.enabled: true
-      discovery.type: single-node
-      cluster.initial_master_nodes: ""
   ingress:
-    enabled: true
+    enabled: false
     annotations: 
       nginx.ingress.kubernetes.io/rewrite-target: /$2
     hosts:
@@ -636,7 +631,7 @@ kibana:
           name: *aas_elasticsearch_secretName
           key: AUDIT_ELASTICSEARCH_PASSWORD
   ingress:
-    enabled: true
+    enabled: false
     hosts:
       - paths:
           - path: /kibana