OPSEXP-2126 ai in the values file

Alfresco · Aug 9, 2023 · e82cd3c · e82cd3c
1 parent 16db45e
commit e82cd3c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
@@ -38,5 +38,5 @@ dependencies:
 - name: alfresco-ai-transformer
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.2.0
-digest: sha256:b0e99dd43fc06a51712fd41ff5c8c0072aec6c1bf29c83bdf01d7cce78874ca0
-generated: "2023-08-09T10:24:27.829744+05:30"
+digest: sha256:a80237bb77bc57f3a12c9b09aa96da7dd563e2705c0d557b9966bab36001940f
+generated: "2023-08-09T15:22:27.217725+05:30"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
@@ -74,5 +74,5 @@ dependencies:
     alias: ai
     version: 0.2.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
-    condition: global.ai.enabled
+    condition: ai.enabled
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -41,6 +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} |
+| 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"` |  |
@@ -169,7 +172,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | database.url | string | `nil` | External Postgresql jdbc url ex: `jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco` |
 | database.user | string | `nil` | External Postgresql database user |
 | email | object | `{"handler":{"folder":{"overwriteDuplicates":true}},"inbound":{"emailContributorsAuthority":"EMAIL_CONTRIBUTORS","enabled":false,"unknownUser":"anonymous"},"initContainers":{"pemToKeystore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"pemToTruststore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"setPerms":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.35.0"}}},"server":{"allowed":{"senders":".*"},"auth":{"enabled":true},"blocked":{"senders":null},"connections":{"max":3},"domain":null,"enableTLS":true,"enabled":false,"hideTLS":false,"port":1125,"requireTLS":false},"ssl":{"secretName":null}}` | For a full information of configuring the inbound email system, see https://docs.alfresco.com/content-services/latest/config/email/#manage-inbound-emails |
-| global.ai | object | `{"enabled":false,"image":{"repository":"quay.io/alfresco/alfresco-ai-docker-engine","tag":"2.0.0"}}` | Choose if you want AI capabilities (globally - including ADW AI plugin) |
+| global.ai | object | `{"enabled":false}` | Choose if you want AI capabilities (globally - including ADW AI plugin) |
 | global.alfrescoRegistryPullSecrets | string | `nil` | 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 |
 | global.elasticsearch | object | `{"host":"elasticsearch-master","password":null,"port":9200,"protocol":"http","user":null}` | Shared connections details for Elasticsearch/Opensearch, required when alfresco-search-enterprise.enabled is true |
 | global.elasticsearch.host | string | `"elasticsearch-master"` | The host where service is available. The provided default is for when elasticsearch.enabled is true |

diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -572,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
@@ -600,9 +605,6 @@ global:
   # -- Choose if you want AI capabilities (globally - including ADW AI plugin)
   ai:
     enabled: false
-    image:
-      repository: quay.io/alfresco/alfresco-ai-docker-engine
-      tag: 2.0.0
     # ai:
     #   aws:
     #   accessKey: