OPSEXP-2126 acs-deployment to rely on chart alfresco-ai-transformer

helm/alfresco-content-services/7.0.N_values.yaml

@@ -2,7 +2,7 @@
 repository:
   image:
     tag: 7.0.1.10
-aiTransformer:
+ai:
   image:
     tag: 1.3.0
 alfresco-transform-service:

helm/alfresco-content-services/7.1.N_values.yaml

@@ -2,7 +2,7 @@
 repository:
   image:
     tag: 7.1.1.8
-aiTransformer:
+ai:
   image:
     tag: 1.4.5
 alfresco-transform-service:

helm/alfresco-content-services/7.2.N_values.yaml

@@ -2,7 +2,7 @@
 repository:
   image:
     tag: 7.2.1.11
-aiTransformer:
+ai:
   image:
     tag: 1.5.0
 alfresco-transform-service:

helm/alfresco-content-services/7.3.N_values.yaml

@@ -2,7 +2,7 @@
 repository:
   image:
     tag: 7.3.1
-aiTransformer:
+ai:
   image:
     tag: 1.5.0
 share:

helm/alfresco-content-services/7.4.N_values.yaml

@@ -24,7 +24,7 @@ alfresco-transform-service:
   filestore:
     image:
       tag: 3.0.0
-aiTransformer:
+ai:
   image:
     tag: 2.0.0
 share:

helm/alfresco-content-services/Chart.lock

@@ -35,5 +35,8 @@ dependencies:
 - name: alfresco-connector-ms365
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.3.3
-digest: sha256:3a93f6ee3002cc5dd78205f1c6fd0075534e9b824894d4752ca86495af9699fc
-generated: "2023-08-01T17:48:28.847175+05:30"
+- name: alfresco-ai-transformer
+  repository: https://alfresco.github.io/alfresco-helm-charts/
+  version: 0.2.0
+digest: sha256:a80237bb77bc57f3a12c9b09aa96da7dd563e2705c0d557b9966bab36001940f
+generated: "2023-08-09T15:22:27.217725+05:30"

helm/alfresco-content-services/Chart.yaml

@@ -70,4 +70,9 @@ dependencies:
     version: 0.3.3
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-connector-ms365.enabled
+  - name: alfresco-ai-transformer
+    alias: ai
+    version: 0.2.0
+    repository: https://alfresco.github.io/alfresco-helm-charts/
+    condition: ai.enabled
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4

helm/alfresco-content-services/README.md

@@ -19,6 +19,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://activiti.github.io/activiti-cloud-helm-charts | alfresco-control-center(common) | 7.11.0 |
 | https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 7.11.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.2.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | ai(alfresco-ai-transformer) | 0.2.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.1.0-alpha.2 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.3.3 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.1.0 |
@@ -40,31 +41,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | activemq.existingSecretName | string | `nil` |  |
 | activemq.nameOverride | string | `"activemq"` |  |
 | activemq.nodeSelector | object | `{}` | Possibility to choose Node for pod, with a key-value pair label e.g {"kubernetes.io/hostname": multinode-demo-m02} |
-| aiTransformer.environment.JAVA_OPTS | string | `"-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` |  |
-| aiTransformer.image.internalPort | int | `8090` |  |
-| aiTransformer.image.pullPolicy | string | `"IfNotPresent"` |  |
-| aiTransformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` |  |
-| aiTransformer.image.tag | string | `"2.0.0"` |  |
-| aiTransformer.livenessProbe.initialDelaySeconds | int | `10` |  |
-| aiTransformer.livenessProbe.livenessPercent | int | `400` |  |
-| aiTransformer.livenessProbe.livenessTransformPeriodSeconds | int | `600` |  |
-| aiTransformer.livenessProbe.maxTransformSeconds | int | `1800` |  |
-| aiTransformer.livenessProbe.maxTransforms | int | `10000` |  |
-| aiTransformer.livenessProbe.periodSeconds | int | `20` |  |
-| aiTransformer.livenessProbe.timeoutSeconds | int | `10` |  |
-| aiTransformer.nodeSelector | object | `{}` |  |
-| aiTransformer.podSecurityContext.runAsUser | int | `33015` |  |
-| aiTransformer.readinessProbe.initialDelaySeconds | int | `20` |  |
-| aiTransformer.readinessProbe.periodSeconds | int | `60` |  |
-| aiTransformer.readinessProbe.timeoutSeconds | int | `10` |  |
-| aiTransformer.replicaCount | int | `2` |  |
-| aiTransformer.resources.limits.cpu | string | `"2"` |  |
-| aiTransformer.resources.limits.memory | string | `"1Gi"` |  |
-| aiTransformer.resources.requests.cpu | string | `"50m"` |  |
-| aiTransformer.resources.requests.memory | string | `"200Mi"` |  |
-| aiTransformer.service.externalPort | int | `80` |  |
-| aiTransformer.service.name | string | `"ai-transformer"` |  |
-| aiTransformer.service.type | string | `"ClusterIP"` |  |
+| ai.enabled | bool | `false` |  |
+| ai.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` |  |
+| ai.image.tag | string | `"2.0.0"` |  |
 | alfresco-connector-ms365.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft 365 |
 | alfresco-connector-ms365.image.repository | string | `"quay.io/alfresco/alfresco-ooi-service"` |  |
 | alfresco-connector-ms365.image.tag | string | `"2.0.0"` |  |

helm/alfresco-content-services/values.yaml

@@ -168,43 +168,6 @@ alfresco-connector-msteams:
   image:
     repository: quay.io/alfresco/alfresco-ms-teams-service
     tag: 2.0.0
-aiTransformer:
-  replicaCount: 2
-  nodeSelector: {}
-  image:
-    repository: quay.io/alfresco/alfresco-ai-docker-engine
-    tag: 2.0.0
-    pullPolicy: IfNotPresent
-    internalPort: 8090
-  service:
-    name: ai-transformer
-    type: ClusterIP
-    externalPort: 80
-  podSecurityContext:
-    runAsUser: 33015
-  resources:
-    requests:
-      cpu: "50m"
-      memory: "200Mi"
-    limits:
-      cpu: "2"
-      memory: "1Gi"
-  environment:
-    JAVA_OPTS: >-
-      -XX:MinRAMPercentage=50
-      -XX:MaxRAMPercentage=80
-  readinessProbe:
-    initialDelaySeconds: 20
-    periodSeconds: 60
-    timeoutSeconds: 10
-  livenessProbe:
-    initialDelaySeconds: 10
-    periodSeconds: 20
-    timeoutSeconds: 10
-    livenessPercent: 400
-    livenessTransformPeriodSeconds: 600
-    maxTransforms: 10000
-    maxTransformSeconds: 1800
 alfresco-transform-service:
   enabled: true
   messageBroker:
@@ -609,6 +572,11 @@ alfresco-sync-service:
   repository:
     nameOverride: alfresco-cs-repository
     port: *repositoryExternalPort
+ai:
+  enabled: false
+  image:
+    repository: quay.io/alfresco/alfresco-ai-docker-engine
+    tag: 2.0.0
 global:
   known_urls:
     - https://localhost

updatecli-matrix-targets.yaml

@@ -84,7 +84,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues231
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose231
@@ -198,7 +198,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues74
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose74
@@ -312,7 +312,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues73
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose73
@@ -426,7 +426,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues72
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose72
@@ -533,7 +533,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues71
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose71
@@ -620,7 +620,7 @@ matrix:
     intelligence:
       version:
       helm_target: *helmvalues70
-      helm_key: $.aiTransformer.image.tag
+      helm_key: $.ai.image.tag
     trouter:
       version:
       compose_target: *compose70