From c98c8feb4089f13ad939a299c831aded379b1900 Mon Sep 17 00:00:00 2001 From: Alex Chapellon Date: Wed, 5 Jul 2023 18:21:20 +0200 Subject: [PATCH] OPSEXP-1861: ATS chart release (#69) --- charts/alfresco-transform-service/Chart.yaml | 2 +- charts/alfresco-transform-service/README.md | 51 +++++++++--------- .../ci/default-values.yaml | 1 - .../templates/secret-messagebroker.yaml | 2 +- charts/alfresco-transform-service/values.yaml | 54 +++++++++---------- matrix-targets.yaml | 39 +++++++++++++- 6 files changed, 88 insertions(+), 61 deletions(-) diff --git a/charts/alfresco-transform-service/Chart.yaml b/charts/alfresco-transform-service/Chart.yaml index 7b7cb7b8..68745930 100644 --- a/charts/alfresco-transform-service/Chart.yaml +++ b/charts/alfresco-transform-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: alfresco-transform-service description: A Helm chart for deploying Alfresco Transform Services type: application -version: 0.1.0-alpha.1 +version: 0.1.0 appVersion: "3.0.0" dependencies: - name: alfresco-common diff --git a/charts/alfresco-transform-service/README.md b/charts/alfresco-transform-service/README.md index ead28717..fe2b91d2 100644 --- a/charts/alfresco-transform-service/README.md +++ b/charts/alfresco-transform-service/README.md @@ -1,6 +1,6 @@ # alfresco-transform-service -![Version: 0.1.0-alpha.1](https://img.shields.io/badge/Version-0.1.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) A Helm chart for deploying Alfresco Transform Services @@ -18,9 +18,8 @@ A Helm chart for deploying Alfresco Transform Services |-----|------|---------|-------------| | activemq.adminUser.password | string | `"admin"` | Default password for the embedded broker admin user | | activemq.adminUser.user | string | `"admin"` | Default username for the embedded broker admin user | -| activemq.enabled | bool | `false` | Deploy ActiveMQ chart as a dependency dependencies should only be called from the root chart | -| activemq.fullnameOverride | string | `nil` | Provide a static name that's used accross the whole Helm release | -| activemq.nameOverride | string | `nil` | Provide a partially static name that's used accross the whole Helm release | +| activemq.enabled | bool | `false` | | +| 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.nameOverride | string | `"alfresco-ai"` | | @@ -47,7 +46,7 @@ A Helm chart for deploying Alfresco Transform Services | filestore.persistence.accessModes | list | `["ReadWriteOnce"]` | Specify a storageClass for dynamic provisioning | | filestore.persistence.data.mountPath | string | `"/tmp/Alfresco"` | | | filestore.persistence.data.subPath | string | `"alfresco-content-services/filestore-data"` | | -| filestore.persistence.enabled | bool | `true` | Persist filestore data | +| filestore.persistence.enabled | bool | `false` | Persist filestore data | | filestore.persistence.existingClaim | string | `nil` | Use pre-provisioned pv through its claim (e.g. static provisionning) | | filestore.persistence.storageClass | string | `nil` | Bind PVC based on storageClass (e.g. dynamic provisionning) | | filestore.podSecurityContext.fsGroup | int | `1000` | | @@ -59,9 +58,9 @@ A Helm chart for deploying Alfresco Transform Services | filestore.readinessProbe.timeoutSeconds | int | `10` | | | filestore.replicaCount | int | `1` | | | filestore.resources.limits.cpu | string | `"2"` | | -| filestore.resources.limits.memory | string | `"1000Mi"` | | -| filestore.resources.requests.cpu | string | `"0.25"` | | -| filestore.resources.requests.memory | string | `"200Mi"` | | +| filestore.resources.limits.memory | string | `"1Gi"` | | +| filestore.resources.requests.cpu | string | `"100m"` | | +| filestore.resources.requests.memory | string | `"250Mi"` | | | filestore.service.externalPort | int | `80` | | | filestore.service.name | string | `"filestore"` | | | filestore.service.type | string | `"ClusterIP"` | | @@ -91,9 +90,9 @@ A Helm chart for deploying Alfresco Transform Services | imagemagick.readinessProbe.timeoutSeconds | int | `10` | | | imagemagick.replicaCount | int | `2` | | | imagemagick.resources.limits.cpu | string | `"4"` | | -| imagemagick.resources.limits.memory | string | `"1000Mi"` | | -| imagemagick.resources.requests.cpu | string | `"0.5"` | | -| imagemagick.resources.requests.memory | string | `"300Mi"` | | +| imagemagick.resources.limits.memory | string | `"4Gi"` | | +| imagemagick.resources.requests.cpu | string | `"250m"` | | +| imagemagick.resources.requests.memory | string | `"250Mi"` | | | imagemagick.service.externalPort | int | `80` | | | imagemagick.service.name | string | `"imagemagick"` | | | imagemagick.service.type | string | `"ClusterIP"` | | @@ -120,9 +119,9 @@ A Helm chart for deploying Alfresco Transform Services | libreoffice.readinessProbe.timeoutSeconds | int | `10` | | | libreoffice.replicaCount | int | `2` | | | libreoffice.resources.limits.cpu | string | `"4"` | | -| libreoffice.resources.limits.memory | string | `"1000Mi"` | | -| libreoffice.resources.requests.cpu | string | `"0.5"` | | -| libreoffice.resources.requests.memory | string | `"400Mi"` | | +| libreoffice.resources.limits.memory | string | `"4Gi"` | | +| libreoffice.resources.requests.cpu | string | `"250m"` | | +| libreoffice.resources.requests.memory | string | `"500Mi"` | | | libreoffice.service.externalPort | int | `80` | | | libreoffice.service.name | string | `"libreoffice"` | | | libreoffice.service.type | string | `"ClusterIP"` | | @@ -152,9 +151,9 @@ A Helm chart for deploying Alfresco Transform Services | pdfrenderer.readinessProbe.timeoutSeconds | int | `10` | | | pdfrenderer.replicaCount | int | `2` | | | pdfrenderer.resources.limits.cpu | string | `"2"` | | -| pdfrenderer.resources.limits.memory | string | `"1000Mi"` | | -| pdfrenderer.resources.requests.cpu | string | `"0.25"` | | -| pdfrenderer.resources.requests.memory | string | `"300Mi"` | | +| pdfrenderer.resources.limits.memory | string | `"2Gi"` | | +| pdfrenderer.resources.requests.cpu | string | `"100m"` | | +| pdfrenderer.resources.requests.memory | string | `"250Mi"` | | | pdfrenderer.service.externalPort | int | `80` | | | pdfrenderer.service.name | string | `"pdfrenderer"` | | | pdfrenderer.service.type | string | `"ClusterIP"` | | @@ -180,9 +179,9 @@ A Helm chart for deploying Alfresco Transform Services | tika.readinessProbe.periodSeconds | int | `60` | | | tika.readinessProbe.timeoutSeconds | int | `10` | | | tika.replicaCount | int | `2` | | -| tika.resources.limits.cpu | string | `"2"` | | -| tika.resources.limits.memory | string | `"1000Mi"` | | -| tika.resources.requests.cpu | string | `"0.25"` | | +| tika.resources.limits.cpu | string | `"4"` | | +| tika.resources.limits.memory | string | `"4Gi"` | | +| tika.resources.requests.cpu | string | `"250m"` | | | tika.resources.requests.memory | string | `"600Mi"` | | | tika.service.externalPort | int | `80` | | | tika.service.name | string | `"tika"` | | @@ -210,9 +209,9 @@ A Helm chart for deploying Alfresco Transform Services | transformmisc.readinessProbe.timeoutSeconds | int | `10` | | | transformmisc.replicaCount | int | `2` | | | transformmisc.resources.limits.cpu | string | `"2"` | | -| transformmisc.resources.limits.memory | string | `"1000Mi"` | | -| transformmisc.resources.requests.cpu | string | `"0.25"` | | -| transformmisc.resources.requests.memory | string | `"300Mi"` | | +| transformmisc.resources.limits.memory | string | `"2Gi"` | | +| transformmisc.resources.requests.cpu | string | `"100m"` | | +| transformmisc.resources.requests.memory | string | `"250Mi"` | | | transformmisc.service.externalPort | int | `80` | | | transformmisc.service.name | string | `"transformmisc"` | | | transformmisc.service.type | string | `"ClusterIP"` | | @@ -235,9 +234,9 @@ A Helm chart for deploying Alfresco Transform Services | transformrouter.readinessProbe.timeoutSeconds | int | `10` | | | transformrouter.replicaCount | int | `2` | | | transformrouter.resources.limits.cpu | string | `"1"` | | -| transformrouter.resources.limits.memory | string | `"512Mi"` | | -| transformrouter.resources.requests.cpu | string | `"0.25"` | | -| transformrouter.resources.requests.memory | string | `"300Mi"` | | +| transformrouter.resources.limits.memory | string | `"1Gi"` | | +| transformrouter.resources.requests.cpu | string | `"100m"` | | +| transformrouter.resources.requests.memory | string | `"250Mi"` | | | transformrouter.service.externalPort | int | `80` | | | transformrouter.service.name | string | `"transform-router"` | | | transformrouter.service.type | string | `"ClusterIP"` | | diff --git a/charts/alfresco-transform-service/ci/default-values.yaml b/charts/alfresco-transform-service/ci/default-values.yaml index 4ba9689c..5f3c5736 100644 --- a/charts/alfresco-transform-service/ci/default-values.yaml +++ b/charts/alfresco-transform-service/ci/default-values.yaml @@ -1,6 +1,5 @@ activemq: enabled: true - nameOverride: activemq resources: requests: cpu: "100m" diff --git a/charts/alfresco-transform-service/templates/secret-messagebroker.yaml b/charts/alfresco-transform-service/templates/secret-messagebroker.yaml index cb1571e1..c1adc888 100644 --- a/charts/alfresco-transform-service/templates/secret-messagebroker.yaml +++ b/charts/alfresco-transform-service/templates/secret-messagebroker.yaml @@ -7,7 +7,7 @@ metadata: {{- include "alfresco-transform-service.labels" $ | nindent 4 }} type: Opaque data: - {{- if or .Values.activemq.enabled .Values.activemq.nameOverride .Values.activemq.fullnameOverride }} + {{- if .Values.activemq.enabled }} BROKER_URL: {{ printf "failover:(nio://%s-broker:61616)?timeout=3000&jms.useCompression=true" (include "alfresco-transform-service.fullname" (dict "Values" .Values.activemq "Chart" .Chart "Release" .Release)) | b64enc | quote }} BROKER_USERNAME: {{ .Values.activemq.adminUser.user | b64enc | quote }} BROKER_PASSWORD: {{ .Values.activemq.adminUser.password | b64enc | quote }} diff --git a/charts/alfresco-transform-service/values.yaml b/charts/alfresco-transform-service/values.yaml index 6403f4ce..8eac9626 100644 --- a/charts/alfresco-transform-service/values.yaml +++ b/charts/alfresco-transform-service/values.yaml @@ -30,11 +30,11 @@ transformrouter: runAsUser: 33016 resources: requests: - cpu: "0.25" - memory: "300Mi" + cpu: "100m" + memory: "250Mi" limits: cpu: "1" - memory: "512Mi" + memory: "1Gi" pdfrenderer: enabled: true @@ -54,11 +54,11 @@ pdfrenderer: runAsUser: 33001 resources: requests: - cpu: "0.25" - memory: "300Mi" + cpu: "100m" + memory: "250Mi" limits: cpu: "2" - memory: "1000Mi" + memory: "2Gi" environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -96,11 +96,11 @@ imagemagick: runAsUser: 33002 resources: requests: - cpu: "0.5" - memory: "300Mi" + cpu: "250m" + memory: "250Mi" limits: cpu: "4" - memory: "1000Mi" + memory: "4Gi" environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -135,11 +135,11 @@ libreoffice: externalPort: 80 resources: requests: - cpu: "0.5" - memory: "400Mi" + cpu: "250m" + memory: "500Mi" limits: cpu: "4" - memory: "1000Mi" + memory: "4Gi" podSecurityContext: runAsNonRoot: true runAsUser: 33003 @@ -180,11 +180,11 @@ tika: runAsUser: 33004 resources: requests: - cpu: "0.25" + cpu: "250m" memory: "600Mi" limits: - cpu: "2" - memory: "1000Mi" + cpu: "4" + memory: "4Gi" environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -222,11 +222,11 @@ transformmisc: runAsUser: 33006 resources: requests: - cpu: "0.25" - memory: "300Mi" + cpu: "100m" + memory: "250Mi" limits: cpu: "2" - memory: "1000Mi" + memory: "2Gi" environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -274,11 +274,11 @@ filestore: fsGroup: 1000 resources: requests: - cpu: "0.25" - memory: "200Mi" + cpu: "100m" + memory: "250Mi" limits: cpu: "2" - memory: "1000Mi" + memory: "1Gi" environment: scheduler.content.age.millis: "86400000" scheduler.cleanup.interval: "86400000" @@ -299,7 +299,7 @@ filestore: livenessSavePeriodSeconds: 600 persistence: # -- Persist filestore data - enabled: true + enabled: false # -- Specify a storageClass for dynamic provisioning accessModes: - ReadWriteOnce @@ -312,13 +312,8 @@ filestore: subPath: "alfresco-content-services/filestore-data" activemq: - # -- Deploy ActiveMQ chart as a dependency - # dependencies should only be called from the root chart + nameOverride: activemq enabled: false - # -- Provide a partially static name that's used accross the whole Helm release - nameOverride: null - # -- Provide a static name that's used accross the whole Helm release - fullnameOverride: null # -- Possibility to choose Node for pod, with a key-value pair label # e.g {"kubernetes.io/hostname": multinode-demo-m02} nodeSelector: {} @@ -335,8 +330,7 @@ messageBroker: password: null # -- Name of the secret managed by this chart secretName: acs-alfresco-cs-brokersecret - # -- Alternatively, provide credentials via an existing secret that contains - # BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys + # -- Alternatively, provide credentials via an existing secret that contains BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys existingSecretName: null ai: diff --git a/matrix-targets.yaml b/matrix-targets.yaml index 7e530524..fb37fa15 100644 --- a/matrix-targets.yaml +++ b/matrix-targets.yaml @@ -3,8 +3,8 @@ # This file is meant to be used with updatecli uber-manifest pipeline # https://github.com/Alfresco/alfresco-updatecli/tree/master/deployments matrix: - latest: - id: latest + 7.4.N: + id: 74n search: version: pattern: @@ -47,3 +47,38 @@ matrix: pattern: helm_target: charts/alfresco-ai-transformer/values.yaml helm_key: image.tag + trouter: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: transformrouter.image.tag + sfs: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: filestore.image.tag + tengine-misc: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: transformmisc.image.tag + tengine-im: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: imagemagick.image.tag + tengine-lo: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: libreoffice.image.tag + tengine-pdf: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: pdfrenderer.image.tag + tengine-tika: + version: + pattern: + helm_target: charts/alfresco-transform-service/values.yaml + helm_key: tika.image.tag