From 48014dcb26d49509bcd23a7787163ca95cb78cbd Mon Sep 17 00:00:00 2001 From: slohe1 Date: Tue, 8 Aug 2023 20:11:10 +0530 Subject: [PATCH 01/13] OPSEXP-2126 alfresco-ai-transformer interation --- .../7.0.N_values.yaml | 2 +- .../7.1.N_values.yaml | 2 +- .../7.2.N_values.yaml | 2 +- .../7.3.N_values.yaml | 2 +- .../7.4.N_values.yaml | 2 +- helm/alfresco-content-services/Chart.lock | 7 +- helm/alfresco-content-services/Chart.yaml | 5 ++ helm/alfresco-content-services/README.md | 28 +------ .../templates/_helpers-ai-transformer.tpl | 11 --- .../templates/config-ai-transformer.yaml | 26 ------ .../templates/deployment-ai-transformer.yaml | 83 ------------------- .../templates/svc-ai-transformer.yaml | 19 ----- helm/alfresco-content-services/values.yaml | 40 +-------- 13 files changed, 20 insertions(+), 209 deletions(-) delete mode 100644 helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl delete mode 100644 helm/alfresco-content-services/templates/config-ai-transformer.yaml delete mode 100644 helm/alfresco-content-services/templates/deployment-ai-transformer.yaml delete mode 100644 helm/alfresco-content-services/templates/svc-ai-transformer.yaml diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml index c608a30c1..347015325 100644 --- a/helm/alfresco-content-services/7.0.N_values.yaml +++ b/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: diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml index d398959c5..ce2926ed2 100644 --- a/helm/alfresco-content-services/7.1.N_values.yaml +++ b/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: diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml index 3a93dd9d1..934f06cc5 100644 --- a/helm/alfresco-content-services/7.2.N_values.yaml +++ b/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: diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml index 337407715..611fe4b6e 100644 --- a/helm/alfresco-content-services/7.3.N_values.yaml +++ b/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: diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index bc7a8bc35..097bdf643 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/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: diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index c1248c8c0..1a5a45ab0 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/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:a7786f3ddab1d95102d793305d819e56deab6dba78b1eda239952a02081ef934 +generated: "2023-08-08T19:52:41.637187+05:30" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index fea531bca..e9e4bf6d5 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/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 diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 61a7d39d7..c2f9e1812 100644 --- a/helm/alfresco-content-services/README.md +++ b/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,6 @@ 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"` | | | 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"` | | @@ -193,7 +169,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}` | Choose if you want AI capabilities (globally - including ADW AI plugin) | +| 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.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/templates/_helpers-ai-transformer.tpl b/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl deleted file mode 100644 index 01174eb31..000000000 --- a/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{- define "ai-transformer.selectorLabels" -}} -app: {{ template "content-services.shortname" . }}-ai-transformer -release: {{ .Release.Name }} -component: transformers -{{- end }} - -{{- define "ai-transformer.labels" -}} -chart: {{ include "content-services.chart" . }} -{{ include "ai-transformer.selectorLabels" . }} -heritage: {{ .Release.Service }} -{{- end }} diff --git a/helm/alfresco-content-services/templates/config-ai-transformer.yaml b/helm/alfresco-content-services/templates/config-ai-transformer.yaml deleted file mode 100644 index 63605e892..000000000 --- a/helm/alfresco-content-services/templates/config-ai-transformer.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if .Values.global.ai.enabled }} -# Defines the properties required by the alfresco-ai-transformer container -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "content-services.shortname" . }}-ai-transformer-configmap - labels: - {{- include "ai-transformer.labels" . | nindent 4 }} -data: - # The JAVA_OPTS defined in the values.yaml file for "ai" are set here using proper quotes - {{- if .Values.aiTransformer.environment }} - {{- range $key, $val := .Values.aiTransformer.environment }} - {{ $key }}: {{ $val | quote }} - {{- end }} - {{- end }} - FILE_STORE_URL: http://{{ template "alfresco.shortname" . }}-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file - AWS_ACCESS_KEY: {{ .Values.ai.aws.accessKey }} - AWS_SECRET_ACCESS_KEY: {{ .Values.ai.aws.secretAccessKey }} - AWS_REGION: {{ .Values.ai.aws.region }} - AWS_S3_BUCKET: {{ .Values.ai.aws.s3Bucket }} - AWS_COMPREHEND_ROLE_ARN: {{ .Values.ai.aws.comprehendRoleARN }} - livenessPercent: "{{ .Values.aiTransformer.livenessProbe.livenessPercent }}" - livenessTransformPeriodSeconds: "{{ .Values.aiTransformer.livenessProbe.livenessTransformPeriodSeconds }}" - maxTransforms: "{{ .Values.aiTransformer.livenessProbe.maxTransforms }}" - maxTransformSeconds: "{{ .Values.aiTransformer.livenessProbe.maxTransformSeconds }}" -{{- end }} diff --git a/helm/alfresco-content-services/templates/deployment-ai-transformer.yaml b/helm/alfresco-content-services/templates/deployment-ai-transformer.yaml deleted file mode 100644 index fa947f4c3..000000000 --- a/helm/alfresco-content-services/templates/deployment-ai-transformer.yaml +++ /dev/null @@ -1,83 +0,0 @@ -{{- if .Values.global.ai.enabled }} -# Defines the deployment for the ai transformer app -# Details: https://github.com/Alfresco/alfresco-ai-transformers/tree/master/alfresco-ai-docker-engine -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "content-services.shortname" . }}-ai-transformer - labels: - {{- include "ai-transformer.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.aiTransformer.replicaCount }} - selector: - matchLabels: - {{- include "ai-transformer.selectorLabels" . | nindent 6 }} - strategy: - type: RollingUpdate - rollingUpdate: -{{ toYaml .Values.global.strategy.rollingUpdate | indent 6 }} - template: - metadata: - annotations: - checksum/config: {{ include (print $.Template.BasePath "/config-ai-transformer.yaml") . | sha256sum }} - labels: - {{- include "ai-transformer.selectorLabels" . | nindent 8 }} - spec: - {{- include "component-pod-security-context" .Values.aiTransformer | indent 4 }} - {{- if .Values.aiTransformer.nodeSelector }} - nodeSelector: {{- .Values.aiTransformer.nodeSelector | toYaml | nindent 8 }} - {{- end }} - {{- include "alfresco-content-services.imagePullSecrets" . | indent 6 }} - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 10 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - {{ template "content-services.shortname" . }}-ai-transformer - topologyKey: failure-domain.beta.kubernetes.io/zone - - weight: 5 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - {{ template "content-services.shortname" . }}-ai-transformer - topologyKey: kubernetes.io/hostname - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.aiTransformer.image.repository }}:{{ .Values.aiTransformer.image.tag }}" - imagePullPolicy: {{ .Values.aiTransformer.image.pullPolicy }} - {{- include "component-security-context" .Values.aiTransformer | indent 8 }} - envFrom: - - configMapRef: - # config map to use, defined in config-ai-transformer.yaml - name: {{ template "content-services.shortname" . }}-ai-transformer-configmap - - secretRef: - name: {{ .Values.messageBroker.existingSecretName | default .Values.messageBroker.secretName }} - env: - {{- include "activemq.env" . | nindent 12 }} - ports: - - containerPort: {{ .Values.aiTransformer.image.internalPort }} - resources: {{- toYaml .Values.aiTransformer.resources | nindent 12 }} - readinessProbe: - httpGet: - path: /ready - port: {{ .Values.aiTransformer.image.internalPort }} - initialDelaySeconds: {{ .Values.aiTransformer.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.aiTransformer.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.aiTransformer.readinessProbe.timeoutSeconds }} - livenessProbe: - httpGet: - path: /live - port: {{ .Values.aiTransformer.image.internalPort }} - initialDelaySeconds: {{ .Values.aiTransformer.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.aiTransformer.livenessProbe.periodSeconds }} - failureThreshold: 1 - timeoutSeconds: {{ .Values.aiTransformer.livenessProbe.timeoutSeconds }} -{{- end }} diff --git a/helm/alfresco-content-services/templates/svc-ai-transformer.yaml b/helm/alfresco-content-services/templates/svc-ai-transformer.yaml deleted file mode 100644 index 4ed041d82..000000000 --- a/helm/alfresco-content-services/templates/svc-ai-transformer.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.global.ai.enabled }} -# Defines the service for the ai transformer app -apiVersion: v1 -kind: Service -metadata: - name: {{ template "content-services.shortname" . }}-ai-transformer - labels: - {{- include "ai-transformer.selectorLabels" . | nindent 4 }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.aiTransformer.service.type }} - ports: - - port: {{ .Values.aiTransformer.service.externalPort }} - targetPort: {{ .Values.aiTransformer.image.internalPort }} - name: {{ .Values.aiTransformer.service.name }} - selector: - {{- include "ai-transformer.selectorLabels" . | nindent 4 }} -{{- end }} diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 2f3b3bdde..8de971b76 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/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: @@ -637,6 +600,9 @@ 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: From 5a9bd0fb5a8cfa24d9c31d80b1209970be5cf80d Mon Sep 17 00:00:00 2001 From: slohe1 Date: Tue, 8 Aug 2023 20:11:46 +0530 Subject: [PATCH 02/13] OPSEXP-2126 updatecli changes --- updatecli-matrix-targets.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml index f2a5473af..e9c35c5ad 100644 --- a/updatecli-matrix-targets.yaml +++ b/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 From 9ee23dcbc3091901dc05fc5ae0d56e189543614f Mon Sep 17 00:00:00 2001 From: slohe1 Date: Tue, 8 Aug 2023 20:17:59 +0530 Subject: [PATCH 03/13] OPSEXP-2126 helm dependency update --- helm/alfresco-content-services/Chart.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 1a5a45ab0..d92e38648 100644 --- 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:a7786f3ddab1d95102d793305d819e56deab6dba78b1eda239952a02081ef934 -generated: "2023-08-08T19:52:41.637187+05:30" +digest: sha256:a80237bb77bc57f3a12c9b09aa96da7dd563e2705c0d557b9966bab36001940f +generated: "2023-08-08T20:15:51.41775+05:30" From 16db45e4138282798e90f54e9dbcb4890225d305 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 9 Aug 2023 12:49:38 +0530 Subject: [PATCH 04/13] OPSEXP-2126 chart condition changes --- helm/alfresco-content-services/Chart.lock | 4 ++-- helm/alfresco-content-services/Chart.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index d92e38648..8a0c8ff73 100644 --- 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:a80237bb77bc57f3a12c9b09aa96da7dd563e2705c0d557b9966bab36001940f -generated: "2023-08-08T20:15:51.41775+05:30" +digest: sha256:b0e99dd43fc06a51712fd41ff5c8c0072aec6c1bf29c83bdf01d7cce78874ca0 +generated: "2023-08-09T10:24:27.829744+05:30" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index e9e4bf6d5..f47dcc9ce 100644 --- 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: ai.enabled + condition: global.ai.enabled icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4 From e82cd3c53e77ab7ec0363b12d9b49dc144c0a507 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 9 Aug 2023 15:58:02 +0530 Subject: [PATCH 05/13] OPSEXP-2126 ai in the values file --- helm/alfresco-content-services/Chart.lock | 4 ++-- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 5 ++++- helm/alfresco-content-services/values.yaml | 8 +++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 8a0c8ff73..249dc46df 100644 --- 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 index f47dcc9ce..e9e4bf6d5 100644 --- 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 index c2f9e1812..7e0d2b179 100644 --- 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 index 8de971b76..5d98b9290 100644 --- 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: From dc4c14d3f67be3e740233e64104058a8a37b5bfe Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 10 Aug 2023 15:54:38 +0530 Subject: [PATCH 06/13] OPSEXP-2126 review comments --- helm/alfresco-content-services/7.0.N_values.yaml | 2 +- helm/alfresco-content-services/7.1.N_values.yaml | 2 +- helm/alfresco-content-services/7.2.N_values.yaml | 2 +- helm/alfresco-content-services/7.3.N_values.yaml | 2 +- helm/alfresco-content-services/7.4.N_values.yaml | 2 +- helm/alfresco-content-services/Chart.lock | 4 ++-- helm/alfresco-content-services/Chart.yaml | 3 +-- helm/alfresco-content-services/README.md | 8 ++++---- helm/alfresco-content-services/community_values.yaml | 2 +- helm/alfresco-content-services/values.yaml | 3 ++- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml index 347015325..fd35b6c66 100644 --- a/helm/alfresco-content-services/7.0.N_values.yaml +++ b/helm/alfresco-content-services/7.0.N_values.yaml @@ -2,7 +2,7 @@ repository: image: tag: 7.0.1.10 -ai: +alfresco-ai-transformer: image: tag: 1.3.0 alfresco-transform-service: diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml index ce2926ed2..b890347b5 100644 --- a/helm/alfresco-content-services/7.1.N_values.yaml +++ b/helm/alfresco-content-services/7.1.N_values.yaml @@ -2,7 +2,7 @@ repository: image: tag: 7.1.1.8 -ai: +alfresco-ai-transformer: image: tag: 1.4.5 alfresco-transform-service: diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml index 934f06cc5..16132d6dd 100644 --- a/helm/alfresco-content-services/7.2.N_values.yaml +++ b/helm/alfresco-content-services/7.2.N_values.yaml @@ -2,7 +2,7 @@ repository: image: tag: 7.2.1.11 -ai: +alfresco-ai-transformer: image: tag: 1.5.0 alfresco-transform-service: diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml index 611fe4b6e..be991b23a 100644 --- a/helm/alfresco-content-services/7.3.N_values.yaml +++ b/helm/alfresco-content-services/7.3.N_values.yaml @@ -2,7 +2,7 @@ repository: image: tag: 7.3.1 -ai: +alfresco-ai-transformer: image: tag: 1.5.0 share: diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index 097bdf643..bddaa76bc 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/helm/alfresco-content-services/7.4.N_values.yaml @@ -24,7 +24,7 @@ alfresco-transform-service: filestore: image: tag: 3.0.0 -ai: +alfresco-ai-transformer: image: tag: 2.0.0 share: diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 249dc46df..8700f3dca 100644 --- 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:a80237bb77bc57f3a12c9b09aa96da7dd563e2705c0d557b9966bab36001940f -generated: "2023-08-09T15:22:27.217725+05:30" +digest: sha256:4eae3ce8eab518a909b08d01ca58ee0b61af7de3a37295d58c1f32f2ca04c355 +generated: "2023-08-10T15:48:17.042551+05:30" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index e9e4bf6d5..0c678700d 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -71,8 +71,7 @@ dependencies: 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 + condition: alfresco-ai-transformer.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 index 7e0d2b179..bc21b793b 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -19,7 +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-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 | @@ -41,9 +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-ai-transformer.enabled | bool | `false` | | +| alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | +| alfresco-ai-transformer.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"` | | diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index fe61f1420..b7efafe4f 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -47,7 +47,7 @@ alfresco-digital-workspace: enabled: false alfresco-sync-service: enabled: false -ai: +alfresco-ai-transformer: enabled: false s3connector: enabled: false diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 5d98b9290..296ac254d 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -572,7 +572,8 @@ alfresco-sync-service: repository: nameOverride: alfresco-cs-repository port: *repositoryExternalPort -ai: + # -- toggle deploying Alfresco ai transformer +alfresco-ai-transformer: enabled: false image: repository: quay.io/alfresco/alfresco-ai-docker-engine From 6a0b4102aa7a9ec6944cb51c7dc2e00e117f7e1e Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 10 Aug 2023 15:55:04 +0530 Subject: [PATCH 07/13] OPSEXP-2126 updatecli updated --- updatecli-matrix-targets.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml index e9c35c5ad..29fbd8e47 100644 --- a/updatecli-matrix-targets.yaml +++ b/updatecli-matrix-targets.yaml @@ -84,7 +84,7 @@ matrix: intelligence: version: helm_target: *helmvalues231 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose231 @@ -198,7 +198,7 @@ matrix: intelligence: version: helm_target: *helmvalues74 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose74 @@ -312,7 +312,7 @@ matrix: intelligence: version: helm_target: *helmvalues73 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose73 @@ -426,7 +426,7 @@ matrix: intelligence: version: helm_target: *helmvalues72 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose72 @@ -533,7 +533,7 @@ matrix: intelligence: version: helm_target: *helmvalues71 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose71 @@ -620,7 +620,7 @@ matrix: intelligence: version: helm_target: *helmvalues70 - helm_key: $.ai.image.tag + helm_key: $.alfresco-ai-transformer.image.tag trouter: version: compose_target: *compose70 From 5383b78eb79a2765d140d196e98c9a028c4ad60c Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 10 Aug 2023 16:38:17 +0530 Subject: [PATCH 08/13] OPSEXP-2126 connections details added --- helm/alfresco-content-services/values.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 296ac254d..22b64c3bc 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -578,6 +578,12 @@ alfresco-ai-transformer: image: repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 2.0.0 + # aws: + # accessKey: + # secretAccessKey: + # region: + # s3Bucket: + # comprehendRoleARN: global: known_urls: - https://localhost @@ -606,13 +612,6 @@ global: # -- Choose if you want AI capabilities (globally - including ADW AI plugin) ai: enabled: false - # ai: - # aws: - # accessKey: - # secretAccessKey: - # region: - # s3Bucket: - # comprehendRoleARN: # -- Shared connections details for Elasticsearch/Opensearch, required when # alfresco-search-enterprise.enabled is true elasticsearch: From 65c053b86e241db354c60ef06c6c0dc3d10e143d Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 10 Aug 2023 18:34:29 +0530 Subject: [PATCH 09/13] OPSEXP-2126 connections value adjustment --- helm/alfresco-content-services/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 22b64c3bc..49502fe61 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -578,12 +578,12 @@ alfresco-ai-transformer: image: repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 2.0.0 - # aws: - # accessKey: - # secretAccessKey: - # region: - # s3Bucket: - # comprehendRoleARN: +# aws: +# accessKey: +# secretAccessKey: +# region: +# s3Bucket: +# comprehendRoleARN: global: known_urls: - https://localhost From ffe9ce7ddeab750000f8588134cc20e30801be7c Mon Sep 17 00:00:00 2001 From: slohe1 Date: Fri, 11 Aug 2023 13:31:45 +0530 Subject: [PATCH 10/13] OPSEXP-2126 review comment --- docs/helm/upgrades.md | 8 ++++++++ helm/alfresco-content-services/README.md | 2 +- helm/alfresco-content-services/values.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/helm/upgrades.md b/docs/helm/upgrades.md index 7baa122ff..89dc1232a 100644 --- a/docs/helm/upgrades.md +++ b/docs/helm/upgrades.md @@ -13,6 +13,14 @@ version in which they have been released. Due to breaking changes the next version will be a major release. +### Alfresco AI Transformer + +After migrating the AI Transformer chart to the new +[alfresco-helm-charts](https://github.com/Alfresco/alfresco-helm-charts) +repository, the associated values have been moved from +`.Values.aiTransformer` to +`.Values.alfresco-ai-transformer`. + ### MS365 chart rename The previous `ooi-service` subchart has been renamed to diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index bc21b793b..47b492b7d 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -172,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}` | Choose if you want AI capabilities (globally - including ADW AI plugin) | +| global.ai.enabled | bool | `false` | Enable AI capabilities in 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 index 49502fe61..c54b1e4ec 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -609,8 +609,8 @@ global: maxUnavailable: 0 registryPullSecrets: - quay-registry-secret - # -- Choose if you want AI capabilities (globally - including ADW AI plugin) ai: + # -- Enable AI capabilities in ADW AI plugin enabled: false # -- Shared connections details for Elasticsearch/Opensearch, required when # alfresco-search-enterprise.enabled is true From c142048d23445e64d2eb9067502a18deb7560bce Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 16 Aug 2023 15:11:31 +0530 Subject: [PATCH 11/13] OPSEXP-2126 testing with the cluster --- helm/alfresco-content-services/Chart.lock | 4 ++-- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 1 - helm/alfresco-content-services/values.yaml | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 8700f3dca..c6e3a6d4f 100644 --- 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:4eae3ce8eab518a909b08d01ca58ee0b61af7de3a37295d58c1f32f2ca04c355 -generated: "2023-08-10T15:48:17.042551+05:30" +digest: sha256:1606881a21b087816ddce0fc1f758f437ce66988f7e1b948ddacfc52cee55fee +generated: "2023-08-16T15:09:09.694356+05:30" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 0c678700d..082a1894b 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -73,5 +73,5 @@ dependencies: - name: alfresco-ai-transformer version: 0.2.0 repository: https://alfresco.github.io/alfresco-helm-charts/ - condition: alfresco-ai-transformer.enabled + condition: global.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 index 47b492b7d..693548963 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -41,7 +41,6 @@ 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} | -| alfresco-ai-transformer.enabled | bool | `false` | | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | | alfresco-ai-transformer.image.tag | string | `"2.0.0"` | | | alfresco-connector-ms365.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft 365 | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index c54b1e4ec..4bc83c162 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -574,7 +574,6 @@ alfresco-sync-service: port: *repositoryExternalPort # -- toggle deploying Alfresco ai transformer alfresco-ai-transformer: - enabled: false image: repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 2.0.0 From 0a81d1c17d36630fc870c5006b7803b7d3a4b3dc Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 16 Aug 2023 15:22:26 +0530 Subject: [PATCH 12/13] OPSEXP-2126 revert the change --- helm/alfresco-content-services/Chart.lock | 4 ++-- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 1 + helm/alfresco-content-services/values.yaml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index c6e3a6d4f..a17ced3e5 100644 --- 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:1606881a21b087816ddce0fc1f758f437ce66988f7e1b948ddacfc52cee55fee -generated: "2023-08-16T15:09:09.694356+05:30" +digest: sha256:4eae3ce8eab518a909b08d01ca58ee0b61af7de3a37295d58c1f32f2ca04c355 +generated: "2023-08-16T15:19:13.452893+05:30" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 082a1894b..0c678700d 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -73,5 +73,5 @@ dependencies: - name: alfresco-ai-transformer version: 0.2.0 repository: https://alfresco.github.io/alfresco-helm-charts/ - condition: global.ai.enabled + condition: alfresco-ai-transformer.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 index 693548963..47b492b7d 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -41,6 +41,7 @@ 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} | +| alfresco-ai-transformer.enabled | bool | `false` | | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | | alfresco-ai-transformer.image.tag | string | `"2.0.0"` | | | alfresco-connector-ms365.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft 365 | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 4bc83c162..c54b1e4ec 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -574,6 +574,7 @@ alfresco-sync-service: port: *repositoryExternalPort # -- toggle deploying Alfresco ai transformer alfresco-ai-transformer: + enabled: false image: repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 2.0.0 From 78b637b081d419db34606172688e617e0d49e251 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 17 Aug 2023 20:25:52 +0530 Subject: [PATCH 13/13] OPSEXP-2126 existing secret added --- helm/alfresco-content-services/README.md | 1 + helm/alfresco-content-services/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 47b492b7d..ceb6374a2 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -44,6 +44,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-ai-transformer.enabled | bool | `false` | | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | | alfresco-ai-transformer.image.tag | string | `"2.0.0"` | | +| alfresco-ai-transformer.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | 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"` | | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index c54b1e4ec..80a253937 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -575,6 +575,8 @@ alfresco-sync-service: # -- toggle deploying Alfresco ai transformer alfresco-ai-transformer: enabled: false + messageBroker: + existingSecretName: *acs_messageBroker_secretName image: repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 2.0.0