Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2440: allow ATS to evaluate template in trouter volumes #190

Closed
wants to merge 2 commits into from
Closed

OPSEXP-2440: allow ATS to evaluate template in trouter volumes #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9526988
allow evaluation of trouter environment vars
alxgomz Jan 15, 2024
1acd452
bump ats chart
alxgomz Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/alfresco-transform-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-transform-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/alfresco-transform-service/templates/config-transform-router.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 3 additions & 4 deletions charts/alfresco-transform-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# -- Additionnal trouter env vars, passed thru tpl function
# -- Additional trouter env vars, passed thru tpl function

environment: |-
JAVA_OPTS: -XX:MaxRAMPercentage=80
readinessProbe:
path: /actuator/health
initialDelaySeconds: 20
Expand Down