From aed23a7deefa415f021d151e05b511aed52b4b89 Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 16 Oct 2024 16:25:41 +0200 Subject: [PATCH] base public url as a env from configmap --- helm/alfresco-content-services/README.md | 4 ++++ .../templates/config-infrastructure.yaml | 1 + helm/alfresco-content-services/values.yaml | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index b160a102b..3351713b3 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -254,6 +254,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | elasticsearchAas.replicas | int | `1` | | | global.aasElasticsearch.existingSecretName | string | `nil` | Name of an existing secret that contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys. | | global.aasElasticsearch.password | string | `nil` | Elasticsearch password | +| global.aasElasticsearch.publicBaseUrl | string | `nil` | Base url for kibana environment variable | | global.aasElasticsearch.secretName | string | `"alfresco-aas-elasticsearch-secret"` | Name of the secret managed by this chart | | global.aasElasticsearch.securecomms | string | `"secret"` | set the security level used with the external search service (secret, none or https) | | global.aasElasticsearch.url | string | `nil` | Elasticsearch URL | @@ -285,6 +286,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | kibana.extraEnvs[2].name | string | `"ELASTICSEARCH_HOSTS"` | | | kibana.extraEnvs[2].valueFrom.configMapKeyRef.key | string | `"AAS_ELASTICSEARCH_URL"` | | | kibana.extraEnvs[2].valueFrom.configMapKeyRef.name | string | `"alfresco-infrastructure"` | | +| kibana.extraEnvs[3].name | string | `"SERVER_PUBLICBASEURL"` | | +| kibana.extraEnvs[3].valueFrom.configMapKeyRef.key | string | `"AAS_SERVER_PUBLICBASEURL"` | | +| kibana.extraEnvs[3].valueFrom.configMapKeyRef.name | string | `"alfresco-infrastructure"` | | | kibana.healthCheckPath | string | `"/kibana/app/kibana"` | | | kibana.ingress.enabled | bool | `true` | | | kibana.ingress.hosts[0].paths[0].path | string | `"/kibana"` | | diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml index 4fe83ea2c..46237a2a4 100644 --- a/helm/alfresco-content-services/templates/config-infrastructure.yaml +++ b/helm/alfresco-content-services/templates/config-infrastructure.yaml @@ -95,3 +95,4 @@ data: {{- printf "AAS_ELASTICSEARCH_URL: %s" $aas_search_url | nindent 2 }} {{- printf "AAS_ELASTICSEARCH_HOST: %s" (include "alfresco-common.url.host" $aas_search_url) | nindent 2 }} {{- printf "AAS_ELASTICSEARCH_PORT: %s" (include "alfresco-common.url.port" $aas_search_url | quote) | nindent 2 }} + AAS_SERVER_PUBLICBASEURL: {{ .Values.global.aasElasticsearch.publicBaseUrl | default "" | quote }} diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 8f424ecf3..458bd30ae 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -75,6 +75,8 @@ global: secretName: &aas_elasticsearch_secretName alfresco-aas-elasticsearch-secret # -- Name of an existing secret that contains ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD keys. existingSecretName: null + # -- Base url for kibana environment variable + publicBaseUrl: null # -- 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 @@ -602,6 +604,11 @@ kibana: configMapKeyRef: name: *infrastructure_cmName key: AAS_ELASTICSEARCH_URL + - name: SERVER_PUBLICBASEURL + valueFrom: + configMapKeyRef: + name: *infrastructure_cmName + key: AAS_SERVER_PUBLICBASEURL ingress: enabled: true hosts: