OPSEXP-2177 Integrate alfresco-search-enterprise v2.0.0-alpha.0 (#1005)

.github/workflows/helm-community.yml

@@ -35,7 +35,14 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        with:
+          ingress-nginx-ref: controller-v1.8.2
+
+      - name: Set nginx ingress config
+        run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+            -p '{"data": {"allow-snippet-annotations":"true"}}'
 
       - name: Create registries auth secret
         if: ${{ ! github.event.repository.fork }}

.github/workflows/helm-enterprise.yml

@@ -96,7 +96,14 @@ jobs:
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        with:
+          ingress-nginx-ref: controller-v1.8.2
+
+      - name: Set nginx ingress config
+        run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+            -p '{"data": {"allow-snippet-annotations":"true"}}'
 
       - name: Create registries auth secret
         run: |

helm/alfresco-content-services/Chart.lock

@@ -25,7 +25,7 @@ dependencies:
   version: 4.3.0
 - name: alfresco-search-enterprise
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.4.0
+  version: 2.0.0-alpha.0
 - name: alfresco-connector-msteams
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.2.0
@@ -38,5 +38,5 @@ dependencies:
 - name: alfresco-ai-transformer
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.3.0
-digest: sha256:6ad76091912aee0b130d5eef18bb86666eedabe0eb708d2b964c47ef5afe4fb6
-generated: "2023-08-29T09:00:00.411365+02:00"
+digest: sha256:dd03e4dd3198c86c65e35b2ac43cb2883a91cd27b943319b3ecd6b19ded3d283
+generated: "2023-09-08T16:36:16.483837+02:00"

helm/alfresco-content-services/Chart.yaml

@@ -53,7 +53,7 @@ dependencies:
     version: 4.3.0
     condition: alfresco-sync-service.enabled
   - name: alfresco-search-enterprise
-    version: 1.4.0
+    version: 2.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-search-enterprise.enabled
   - name: alfresco-connector-msteams

helm/alfresco-content-services/README.md

@@ -23,7 +23,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.1.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.4.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.2.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 1.4.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 2.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 1.3.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.1.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 4.3.0 |
@@ -105,12 +105,10 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-search-enterprise.liveIndexing.metadata.image.tag | string | `"3.4.0-M1"` |  |
 | alfresco-search-enterprise.liveIndexing.path.image.tag | string | `"3.4.0-M1"` |  |
 | alfresco-search-enterprise.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` |  |
+| alfresco-search-enterprise.reindexing.db.existingConfigMap.name | string | `"acs-alfresco-cs-dbconfigmap"` |  |
+| alfresco-search-enterprise.reindexing.db.existingSecret.name | string | `"acs-alfresco-cs-dbsecret"` |  |
 | alfresco-search-enterprise.reindexing.enabled | bool | `true` |  |
 | alfresco-search-enterprise.reindexing.image.tag | string | `"3.4.0-M1"` |  |
-| alfresco-search-enterprise.reindexing.postgresql.database | string | `"alfresco"` |  |
-| alfresco-search-enterprise.reindexing.postgresql.existingSecretName | string | `"acs-alfresco-cs-dbsecret"` |  |
-| alfresco-search-enterprise.reindexing.postgresql.hostname | string | `"postgresql-acs"` |  |
-| alfresco-search-enterprise.reindexing.postgresql.url | string | `nil` |  |
 | alfresco-search.alfresco-insight-zeppelin.enabled | bool | `false` |  |
 | alfresco-search.enabled | bool | `true` |  |
 | alfresco-search.external.host | string | `nil` | Host dns/ip of the external solr6 instance. |
@@ -165,6 +163,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-transform-service.transformrouter.image.tag | string | `"3.0.1-A3"` |  |
 | alfresco-transform-service.transformrouter.replicaCount | int | `2` |  |
 | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository |
+| database.configMapName | string | `"acs-alfresco-cs-dbconfigmap"` |  |
 | database.driver | string | `nil` | Postgresql jdbc driver name ex: org.postgresql.Driver. It should be available in the container image. |
 | database.existingSecretName | string | `nil` | An existing secret that contains DATABASE_USERNAME and DATABASE_PASSWORD keys. When using embedded postgres you need to also set `postgresql.existingSecret`. |
 | database.external | bool | `false` | Enable using an external database for Alfresco Content Services. Must disable `postgresql.enabled` when true. |

helm/alfresco-content-services/templates/config-database.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.database.configMapName }}
+  labels:
+    {{- include "repository.labels" . | nindent 4 }}
+data:
+  {{- $databaseURL := .Values.database.url }}
+  {{- if not .Values.database.external }}
+  {{- $databaseURL = (printf "jdbc:postgresql://%s-%s:%d/%s" .Release.Name .Values.postgresql.nameOverride (int .Values.postgresql.primary.service.ports.postgresql) .Values.postgresql.auth.database) }}
+  {{- end }}
+  DATABASE_URL: {{ $databaseURL }}

helm/alfresco-content-services/tests/config-database_test.yaml

@@ -0,0 +1,25 @@
+---
+suite: test config-database manifest
+templates:
+  - config-database.yaml
+tests:
+  - it: should reference embedded postgres with default values
+    values: &testvalues
+      - values/test_values.yaml
+    asserts:
+      - equal:
+          path: data.DATABASE_URL
+          value: jdbc:postgresql://RELEASE-NAME-postgresql-acs:5432/alfresco
+        template: config-database.yaml
+
+  - it: should reference external postgres when enabled
+    values: *testvalues
+    set:
+      database:
+        external: true
+        url: jdbc:postgresql://my-external-postgresql-acs:5432/alfresco
+    asserts:
+      - equal:
+          path: data.DATABASE_URL
+          value: jdbc:postgresql://my-external-postgresql-acs:5432/alfresco
+        template: config-database.yaml

helm/alfresco-content-services/values.yaml

@@ -287,6 +287,7 @@ database:
   url: null
   # -- Name of the secret managed by this chart
   secretName: &acs_database_secretName acs-alfresco-cs-dbsecret
+  configMapName: &acs_database_configMapName acs-alfresco-cs-dbconfigmap
   # -- An existing secret that contains DATABASE_USERNAME and DATABASE_PASSWORD keys.
   # When using embedded postgres you need to also set `postgresql.existingSecret`.
   existingSecretName: null
@@ -312,11 +313,11 @@ alfresco-search-enterprise:
         tag: 3.4.0-M1
   reindexing:
     enabled: true
-    postgresql:
-      url: null
-      hostname: postgresql-acs
-      database: alfresco
-      existingSecretName: *acs_database_secretName
+    db:
+      existingSecret:
+        name: *acs_database_secretName
+      existingConfigMap:
+        name: *acs_database_configMapName
     image:
       tag: 3.4.0-M1
 alfresco-digital-workspace: