From 95269883563f6d20a2ab8aee53f1563a7ba8cddc Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 15 Jan 2024 15:21:36 +0100 Subject: [PATCH 1/2] allow evaluation of trouter environment vars --- charts/alfresco-transform-service/README.md | 2 +- .../templates/config-transform-router.yaml | 2 +- charts/alfresco-transform-service/values.yaml | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/charts/alfresco-transform-service/README.md b/charts/alfresco-transform-service/README.md index 27702897..3f57a78e 100644 --- a/charts/alfresco-transform-service/README.md +++ b/charts/alfresco-transform-service/README.md @@ -257,7 +257,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs | transformmisc.volumes | list | `[]` | | | transformrouter.affinity | string | `"podAntiAffinity:\n preferredDuringSchedulingIgnoredDuringExecution:\n - weight: 10\n podAffinityTerm:\n labelSelector:\n matchExpressions:\n - key: app\n operator: In\n values:\n - {{ template \"alfresco-transform-service.transform-router.name\" . }}\n topologyKey: topology.kubernetes.io/zone\n - weight: 5\n podAffinityTerm:\n labelSelector:\n matchExpressions:\n - key: app\n operator: In\n values:\n - {{ template \"alfresco-transform-service.transform-router.name\" . }}\n topologyKey: app.kubernetes.io/name"` | Pod affinity, passed thru tpl function | | transformrouter.enabled | bool | `true` | | -| transformrouter.environment.JAVA_OPTS | string | `"-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` | | +| transformrouter.environment | string | `"JAVA_OPTS: -XX:MaxRAMPercentage=80"` | Additionnal trouter env vars, passed thru tpl function | | transformrouter.image.internalPort | int | `8095` | | | transformrouter.image.pullPolicy | string | `"IfNotPresent"` | | | transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` | | diff --git a/charts/alfresco-transform-service/templates/config-transform-router.yaml b/charts/alfresco-transform-service/templates/config-transform-router.yaml index 1f0f7d87..6e309dd9 100644 --- a/charts/alfresco-transform-service/templates/config-transform-router.yaml +++ b/charts/alfresco-transform-service/templates/config-transform-router.yaml @@ -15,7 +15,7 @@ data: {{- if .Values.transformmisc.enabled }} MISC_URL: http://{{ template "alfresco-transform-service.transform-misc.name" . }}:80 {{- end }} - {{- toYaml .Values.transformrouter.environment | nindent 2 }} + {{- tpl .Values.transformrouter.environment $ | nindent 2 }} {{- range $key, $val := .Values.transformrouter.livenessProbe }} {{ $key }}: {{ $val | quote }} {{- end }} diff --git a/charts/alfresco-transform-service/values.yaml b/charts/alfresco-transform-service/values.yaml index 48a1ddb6..87462d36 100644 --- a/charts/alfresco-transform-service/values.yaml +++ b/charts/alfresco-transform-service/values.yaml @@ -36,10 +36,9 @@ transformrouter: name: transform-router type: ClusterIP externalPort: 80 - environment: - JAVA_OPTS: >- - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 + # -- Additionnal trouter env vars, passed thru tpl function + environment: |- + JAVA_OPTS: -XX:MaxRAMPercentage=80 readinessProbe: path: /actuator/health initialDelaySeconds: 20 From 1acd452b0e3366a2b79d7b1ac9f9f33a73c003e0 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 15 Jan 2024 15:22:38 +0100 Subject: [PATCH 2/2] bump ats chart --- charts/alfresco-transform-service/Chart.yaml | 2 +- charts/alfresco-transform-service/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/alfresco-transform-service/Chart.yaml b/charts/alfresco-transform-service/Chart.yaml index 21801d17..e836569d 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: 1.0.0-alpha.2 +version: 1.0.0-alpha.3 appVersion: 4.0.1 dependencies: - name: alfresco-common diff --git a/charts/alfresco-transform-service/README.md b/charts/alfresco-transform-service/README.md index 3f57a78e..f2d7e53c 100644 --- a/charts/alfresco-transform-service/README.md +++ b/charts/alfresco-transform-service/README.md @@ -1,6 +1,6 @@ # alfresco-transform-service -![Version: 1.0.0-alpha.2](https://img.shields.io/badge/Version-1.0.0--alpha.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.1](https://img.shields.io/badge/AppVersion-4.0.1-informational?style=flat-square) +![Version: 1.0.0-alpha.3](https://img.shields.io/badge/Version-1.0.0--alpha.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.1](https://img.shields.io/badge/AppVersion-4.0.1-informational?style=flat-square) A Helm chart for deploying Alfresco Transform Services