review

Alfresco · Oct 17, 2024 · d692b2a · d692b2a
1 parent d072586
commit d692b2a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
@@ -56,5 +56,5 @@ dependencies:
 - name: alfresco-audit-storage
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.1.0-alpha.0
-digest: sha256:e4670d3d8b04b44406f5b34e73a58ab29da2ffcaffd666463dd9fab2c42ad6b7
-generated: "2024-10-16T17:21:55.923332+02:00"
+digest: sha256:f8c3727de2d81580efc42d55fc93af0b2766a8c8526d0c34f40a3b080d5915e6
+generated: "2024-10-17T21:30:03.622981+02:00"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
@@ -91,9 +91,10 @@ dependencies:
     version: 7.17.3
     condition: elasticsearchAudit.enabled
   - name: kibana
+    alias: kibanaAudit
     repository: https://helm.elastic.co
     version: 7.17.3
-    condition: kibana.enabled
+    condition: kibanaAudit.enabled
   - name: alfresco-audit-storage
     version: 0.1.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -38,7 +38,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 2.1.1 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |
 | https://helm.elastic.co | elasticsearchAudit(elasticsearch) | 7.17.3 |
-| https://helm.elastic.co | kibana | 7.17.3 |
+| https://helm.elastic.co | kibanaAudit(kibana) | 7.17.3 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |
 
@@ -282,13 +282,13 @@ 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.elasticsearchHosts | string | `""` | Makes sure there is no default elasticsearch hosts defined |
-| 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 | `false` |  |
-| kibana.ingress.hosts[0].paths[0].path | string | `"/kibana"` |  |
-| kibana.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| kibanaAudit.elasticsearchHosts | string | `""` | Makes sure there is no default elasticsearch hosts defined |
+| kibanaAudit.enabled | bool | `true` |  |
+| kibanaAudit.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 |
+| kibanaAudit.healthCheckPath | string | `"/kibana/app/kibana"` |  |
+| kibanaAudit.ingress.enabled | bool | `false` |  |
+| kibanaAudit.ingress.hosts[0].paths[0].path | string | `"/kibana"` |  |
+| kibanaAudit.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 |

diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -599,7 +599,7 @@ alfresco-audit-storage:
       keys:
         username: AUDIT_ELASTICSEARCH_USERNAME
         password: AUDIT_ELASTICSEARCH_PASSWORD
-kibana:
+kibanaAudit:
   enabled: true
   healthCheckPath: "/kibana/app/kibana"
   # -- Makes sure there is no default elasticsearch hosts defined

diff --git a/test/community-integration-test-values.yaml b/test/community-integration-test-values.yaml
@@ -92,7 +92,7 @@ postgresql:
         memory: "1Gi"
 elasticsearchAudit:
   enabled: false
-kibana:
+kibanaAudit:
   enabled: false
 alfresco-audit-storage:
   enabled: false

diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml
@@ -188,7 +188,7 @@ alfresco-audit-storage:
     requests:
       cpu: "0.01"
       memory: "512Mi"
-kibana:
+kibanaAudit:
   resources:
     requests:
       cpu: "0.01"