OPSEXP-2293: use ATS common named templates in ai & search ent charts (…

…#172)
Alfresco · Dec 20, 2023 · 1ce5f33 · 1ce5f33
1 parent f008d9d
commit 1ce5f33
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 33 deletions.
diff --git a/charts/alfresco-ai-transformer/Chart.lock b/charts/alfresco-ai-transformer/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.0.0
+  version: 3.1.0
 - name: activemq
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.4.1
-digest: sha256:9cc0f93b3dd14c9dde5cb9d9f4b7540d9d40d02d66b2a8d8eabd9d7f4f033f5c
-generated: "2023-12-15T14:43:55.754327+01:00"
+digest: sha256:8f825cf87b012ee7684da3f9ab8be433116bbe4803b564abf99b8c8677b4096f
+generated: "2023-12-20T11:29:34.098499+01:00"
diff --git a/charts/alfresco-ai-transformer/Chart.yaml b/charts/alfresco-ai-transformer/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 name: alfresco-ai-transformer
 description: A Helm chart for deploying Alfresco ai transformer service
 type: application
-version: 1.0.0-alpha.1
+version: 1.0.0-alpha.2
 appVersion: 3.0.1
 dependencies:
   - name: alfresco-common
-    version: 3.0.0
+    version: 3.1.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: activemq
     version: 3.4.1

diff --git a/charts/alfresco-ai-transformer/README.md b/charts/alfresco-ai-transformer/README.md
@@ -1,6 +1,6 @@
 # alfresco-ai-transformer
 
-![Version: 1.0.0-alpha.1](https://img.shields.io/badge/Version-1.0.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.1](https://img.shields.io/badge/AppVersion-3.0.1-informational?style=flat-square)
+![Version: 1.0.0-alpha.2](https://img.shields.io/badge/Version-1.0.0--alpha.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.1](https://img.shields.io/badge/AppVersion-3.0.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco ai transformer service
 
@@ -9,7 +9,7 @@ A Helm chart for deploying Alfresco ai transformer service
 | Repository | Name | Version |
 |------------|------|---------|
 | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.4.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.0 |
 
 ## Values
 

diff --git a/charts/alfresco-ai-transformer/templates/config-sfs.yaml b/charts/alfresco-ai-transformer/templates/config-sfs.yaml
@@ -8,5 +8,5 @@ metadata:
     {{- include "alfresco-ai-transformer.labels" . | nindent 4 }}
 data:
   {{- $reqmsg := "You must provide a base URL for the filestore service as sfs.url" }}
-  FILE_STORE_URL: {{ printf "%s/alfresco/api/-default-/private/sfs/versions/1/file"  (required $reqmsg .Values.sfs.url) }}
+  FILE_STORE_URL: {{ template "alfresco-common.sfs.fullurl" (required $reqmsg .Values.sfs.url) }}
 {{- end }}
diff --git a/charts/alfresco-ai-transformer/tests/confimap_test.yaml b/charts/alfresco-ai-transformer/tests/confimap_test.yaml
@@ -33,7 +33,7 @@ tests:
       template: config-ai-transformer.yaml
     - equal:
         path: data.FILE_STORE_URL
-        value: http://acs-alfresco-transform-service/alfresco/api/-default-/private/sfs/versions/1/file
+        value: http://acs-alfresco-transform-service/alfresco/api/-default-/private/sfs/versions/1/file/
       template: config-sfs.yaml
     - equal:
         path: data.BROKER_URL

diff --git a/charts/alfresco-search-enterprise/Chart.lock b/charts/alfresco-search-enterprise/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.0.0
+  version: 3.1.0
 - name: activemq
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.3.0
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.17.3
-digest: sha256:7735156b1a0223a5cf10a4aeadeef49947b6ba7a9dd7406a72d69ca879663217
-generated: "2023-11-09T16:04:07.735524+01:00"
+digest: sha256:d5881fd97ae993a4feec9fd2a4ca522015862f42217e14c0965918882aa5a04e
+generated: "2023-12-20T11:35:40.838553+01:00"
diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,11 +3,11 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 3.0.3
+version: 3.1.0-alpha.1
 appVersion: 4.0.0.1
 dependencies:
   - name: alfresco-common
-    version: 3.0.0
+    version: 3.1.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: activemq
     version: 3.3.0

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0.1](https://img.shields.io/badge/AppVersion-4.0.0.1-informational?style=flat-square)
+![Version: 3.1.0-alpha.1](https://img.shields.io/badge/Version-3.1.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0.1](https://img.shields.io/badge/AppVersion-4.0.0.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 
@@ -11,7 +11,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | Repository | Name | Version |
 |------------|------|---------|
 | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.3.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.0 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |
 
 ## Values

diff --git a/charts/alfresco-search-enterprise/templates/_helpers-ats.tpl b/charts/alfresco-search-enterprise/templates/_helpers-ats.tpl
@@ -6,7 +6,7 @@ Usage: include "alfresco-search-enterprise.transform.fullurl" "URL"
 
 */}}
 {{- define "alfresco-search-enterprise.ats.fullurl" -}}
-  ATS_URL: {{ printf "%s/transform/config" . }}
+  ATS_URL: {{ template "alfresco-common.ats.fullurl" . }}
 {{- end -}}
 
 {{/*
@@ -17,7 +17,7 @@ Usage: include "alfresco-search-enterprise.sfs.fullurl" "URL"
 
 */}}
 {{- define "alfresco-search-enterprise.sfs.fullurl" -}}
-  SFS_URL: {{ printf "%s/alfresco/api/-default-/private/sfs/versions/1/file/" . }}
+  SFS_URL: {{ template "alfresco-common.sfs.fullurl" . }}
 {{- end -}}
 
 {{/*

diff --git a/charts/alfresco-search-enterprise/tests/configmaps_test.yaml b/charts/alfresco-search-enterprise/tests/configmaps_test.yaml
@@ -2,12 +2,11 @@
 suite: test configmaps
 templates:
   - configmap-mq.yaml
+  - configmap-ats.yaml
   - configmap-database.yaml
   - configmap-repository.yaml
 tests:
   - it: should fail rendering manifest without required Alfresco repository values
-    values: &testvalues
-      - values/embedded-charts-values.yaml
     asserts:
       - failedTemplate:
           errorMessage: .reindexing.repository.url is mandatory when not using existingConfigMap
@@ -24,14 +23,23 @@ tests:
         template: configmap-mq.yaml
 
   - it: should create a cm from messageBroker provided values
-    values: *testvalues
+    values: &testvalues
+      - values/embedded-charts-values.yaml
     set:
       reindexing.enabled: false
     asserts:
       - equal:
           path: data.BROKER_URL
           value: failover:(tcp://localhost:61616)
         template: configmap-mq.yaml
+      - equal:
+          path: data.ATS_URL
+          value: http://transform/transform/config
+        template: configmap-ats.yaml
+      - equal:
+          path: data.SFS_URL
+          value: http://sfs/alfresco/api/-default-/private/sfs/versions/1/file/
+        template: configmap-ats.yaml
 
   - it: should fail rendering manifest without required values
     values: *testvalues
@@ -60,18 +68,6 @@ tests:
           value: https://mycm.domain.tld/alfresco
         template: configmap-repository.yaml
 
-  - it: should have mq configmap render from values
-    set:
-      reindexing:
-          enabled: false
-      messageBroker:
-        url: ssl://some.broker.domain.tld:61617
-    asserts:
-      - equal:
-          path: data.BROKER_URL
-          value: failover:(ssl://some.broker.domain.tld:61617)
-        template: configmap-mq.yaml
-
   - it: should not render cm when existingConfigMap is set
     values: *testvalues
     set: