From 160cd7015b62aa4a382c59adb73d828d8b12bc9f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:18:12 +0100 Subject: [PATCH] OPSEXP-2301 Bump alfresco-transform-service chart to 1.0.0-alpha.2 (#1066) --- helm/alfresco-content-services/Chart.lock | 6 ++--- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 5 ++-- .../templates/_helpers-ats.tpl | 24 +++++++++---------- .../templates/config-infrastructure.yaml | 4 ++-- helm/alfresco-content-services/values.yaml | 6 ++++- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 1f5315c99..b88d7e9db 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/helm/alfresco-content-services/Chart.lock @@ -19,7 +19,7 @@ dependencies: version: 3.4.1 - name: alfresco-transform-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.3.2 + version: 1.0.0-alpha.2 - name: alfresco-search-service repository: https://alfresco.github.io/alfresco-helm-charts/ version: 2.0.0 @@ -44,5 +44,5 @@ dependencies: - name: elasticsearch repository: https://helm.elastic.co version: 7.17.3 -digest: sha256:4d83f5de310859c72b4c9c6016e9cbcf09a9fe2b72db802dc1d121c6b8105c1c -generated: "2024-01-09T16:05:25.672783+01:00" +digest: sha256:02be1c10b63c9e03784d7d7ef53893da3cc4bb46cb975274876ad791e16c0f14 +generated: "2024-01-09T16:33:13.116899+01:00" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index c0aa77a78..884c20e8c 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -43,7 +43,7 @@ dependencies: repository: https://alfresco.github.io/alfresco-helm-charts/ condition: activemq.enabled - name: alfresco-transform-service - version: 0.3.2 + version: 1.0.0-alpha.2 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-transform-service.enabled - name: alfresco-search-service diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 120bb098a..4454a2a66 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -28,7 +28,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 2.0.0 | | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.3.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 4.5.1 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 0.3.2 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.0.0-alpha.2 | | https://helm.elastic.co | elasticsearch | 7.17.3 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 | @@ -189,7 +189,8 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-transform-service.libreoffice.enabled | bool | `true` | Declares the alfresco-libreoffice service used by the content repository to transform office files | | alfresco-transform-service.libreoffice.image.repository | string | `"alfresco/alfresco-libreoffice"` | | | alfresco-transform-service.libreoffice.image.tag | string | `"5.0.1"` | | -| alfresco-transform-service.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | +| alfresco-transform-service.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` | Name of the configmap which holds the ATS shared filestore URL | +| alfresco-transform-service.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-transform-service.pdfrenderer.enabled | bool | `true` | Declares the alfresco-pdf-renderer service used by the content repository to transform pdf files | | alfresco-transform-service.pdfrenderer.image.repository | string | `"alfresco/alfresco-pdf-renderer"` | | | alfresco-transform-service.pdfrenderer.image.tag | string | `"5.0.1"` | | diff --git a/helm/alfresco-content-services/templates/_helpers-ats.tpl b/helm/alfresco-content-services/templates/_helpers-ats.tpl index 02060ba5c..61f439485 100644 --- a/helm/alfresco-content-services/templates/_helpers-ats.tpl +++ b/helm/alfresco-content-services/templates/_helpers-ats.tpl @@ -3,22 +3,22 @@ Local transformers config */}} {{- define "alfresco-content-services.localTransformConfig" -}} localTransform.core-aio.url= -localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.deployment-pdfrenderer.name" . }} -localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.deployment-imagemagick.name" . }} -localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.deployment-libreoffice.name" . }} -localTransform.tika.url=http://{{ template "alfresco-transform-service.deployment-tika.name" . }} -localTransform.misc.url=http://{{ template "alfresco-transform-service.deployment-transform-misc.name" . }} +localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }} +localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }} +localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }} +localTransform.tika.url=http://{{ template "alfresco-transform-service.tika.name" . }} +localTransform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }} {{- end -}} {{/* ATS Tengines config */}} {{- define "alfresco-content-services.tengineConfig" -}} -alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.deployment-pdfrenderer.name" . }} -img.url=http://{{ template "alfresco-transform-service.deployment-imagemagick.name" . }} -jodconverter.url=http://{{ template "alfresco-transform-service.deployment-libreoffice.name" . }} -tika.url=http://{{ template "alfresco-transform-service.deployment-tika.name" . }} -transform.misc.url=http://{{ template "alfresco-transform-service.deployment-transform-misc.name" . }} +alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }} +img.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }} +jodconverter.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }} +tika.url=http://{{ template "alfresco-transform-service.tika.name" . }} +transform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }} {{- end -}} {{/* @@ -30,8 +30,8 @@ Get Alfresco Content Service configuration for Alfresco Transform Service {{- if and $atsCtx.Values.filestore.enabled $atsCtx.Values.transformrouter.enabled }} {{- $routerCtx := (dict "Values" (dict "nameOverride" "router" ) "Chart" .Chart "Release" .Release) }} {{- $sfsCtx := (dict "Values" (dict "nameOverride" "filestore" ) "Chart" .Chart "Release" .Release) }} -transform.service.url=http://{{ template "alfresco-transform-service.deployment-transform-router.name" $atsCtx }} -sfs.url=http://{{ template "alfresco-transform-service.deployment-filestore.name" $atsCtx }} +transform.service.url=http://{{ template "alfresco-transform-service.transform-router.name" $atsCtx }} +sfs.url=http://{{ template "alfresco-transform-service.filestore.name" $atsCtx }} {{ template "alfresco-content-services.tengineConfig" $atsCtx }} {{- end }} {{- end }} diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml index d8959f9de..ba581a277 100644 --- a/helm/alfresco-content-services/templates/config-infrastructure.yaml +++ b/helm/alfresco-content-services/templates/config-infrastructure.yaml @@ -54,8 +54,8 @@ data: {{- with (index .Values "alfresco-transform-service") }} {{- $atsCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }} {{- if and .enabled .filestore.enabled .transformrouter.enabled }} - SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.deployment-filestore.name" $atsCtx)) }} - {{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.deployment-transform-router.name" $atsCtx)) }} + SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.filestore.name" $atsCtx)) }} + {{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.transform-router.name" $atsCtx)) }} {{- if index $.Values "alfresco-search-enterprise" "enabled" }} {{- include "alfresco-search-enterprise.ats.fullurl" $ats_baseurl | nindent 2 }} {{- end }} diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 1dc32ff85..d9039aacb 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -167,7 +167,11 @@ alfresco-connector-msteams: alfresco-transform-service: enabled: true messageBroker: - existingSecretName: *acs_messageBroker_secretName + existingConfigMap: + # -- Name of the configmap which holds the ATS shared filestore URL + name: *infrastructure_cmName + existingSecret: + name: *acs_messageBroker_secretName transformrouter: # -- Declares the alfresco-transform-router service used by the content repository # to route transformation requests