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.

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-2115: bump charts to add consistent default affinity rules #1167

Merged
merged 4 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .github/workflows/helm-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ jobs:
run: |
if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then
echo "Enabling clustered tests via auto-scaling: 2 replicas max, 10s stabilization window"
echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \
--set alfresco-repository.autoscaling.maxReplicas=2 \
--set alfresco-repository.autoscaling.behavior.scaleUp.stabilizationWindowSeconds=10 \
echo "helm_install_params=--values test/autoscaling-hpa-test-values.yaml \
--set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT"
fi
if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then
Expand Down
20 changes: 10 additions & 10 deletions helm/alfresco-content-services/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ dependencies:
version: 0.1.0
- name: alfresco-repository
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.5.1
version: 0.6.0-alpha.0
- name: activemq
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 3.5.3
- name: alfresco-transform-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 1.3.2
version: 2.0.0-alpha.0
- name: alfresco-search-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 3.3.1
- name: alfresco-sync-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 5.2.3
version: 6.0.0-alpha.0
- name: alfresco-search-enterprise
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 3.2.6
version: 4.0.0-alpha.0
- name: alfresco-connector-msteams
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.5.1
version: 0.6.0-alpha.0
- name: alfresco-share
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.6.1
version: 1.0.0-alpha.0
- name: alfresco-connector-ms365
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.7.1
version: 1.0.0-alpha.0
- name: alfresco-ai-transformer
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 1.2.3
version: 2.0.0-alpha.0
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.17.3
digest: sha256:4eacdf946479b47b7276bfdf86ebb6b513266f0e293ed10eae66c495abbf9b78
generated: "2024-06-04T12:18:05.816648+02:00"
digest: sha256:01a9b9eb4f01b7693b7f7969df1fcd1fcc8ff988ecd60a330159f8c81111b395
generated: "2024-06-18T16:13:45.778249+02:00"
18 changes: 9 additions & 9 deletions helm/alfresco-content-services/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://www.alfresco.com/platform/content-services-ecm/trial/download
apiVersion: v2
name: alfresco-content-services
version: 8.2.0
version: 8.3.0-alpha.0
appVersion: 23.2.1
description: A Helm chart for deploying Alfresco Content Services
keywords:
Expand Down Expand Up @@ -41,14 +41,14 @@ dependencies:
condition: >-
alfresco-digital-workspace.enabled
- name: alfresco-repository
version: 0.5.1
version: 0.6.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
- name: activemq
version: 3.5.3
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: activemq.enabled
- name: alfresco-transform-service
version: 1.3.2
version: 2.0.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: alfresco-transform-service.enabled
- name: alfresco-search-service
Expand All @@ -58,27 +58,27 @@ dependencies:
condition: alfresco-search.enabled
- name: alfresco-sync-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 5.2.3
version: 6.0.0-alpha.0
condition: alfresco-sync-service.enabled
- name: alfresco-search-enterprise
version: 3.2.6
version: 4.0.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: alfresco-search-enterprise.enabled
- name: alfresco-connector-msteams
version: 0.5.1
version: 0.6.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: alfresco-connector-msteams.enabled
- name: alfresco-share
alias: share
version: 0.6.1
version: 1.0.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: share.enabled
- name: alfresco-connector-ms365
version: 0.7.1
version: 1.0.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: alfresco-connector-ms365.enabled
- name: alfresco-ai-transformer
version: 1.2.3
version: 2.0.0-alpha.0
repository: https://alfresco.github.io/alfresco-helm-charts/
condition: alfresco-ai-transformer.enabled
- name: elasticsearch
Expand Down
18 changes: 9 additions & 9 deletions helm/alfresco-content-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ grand_parent: Helm

# alfresco-content-services

![Version: 8.2.0](https://img.shields.io/badge/Version-8.2.0-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square)
![Version: 8.3.0-alpha.0](https://img.shields.io/badge/Version-8.3.0--alpha.0-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square)

A Helm chart for deploying Alfresco Content Services

Expand All @@ -25,16 +25,16 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
| https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.5.3 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-control-center(alfresco-adf-app) | 0.1.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-digital-workspace(alfresco-adf-app) | 0.1.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 1.2.3 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 2.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.3 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.7.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.5.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.5.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.2.6 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 1.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.6.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.6.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 4.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.3.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.6.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.2.3 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.3.2 |
| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 1.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 6.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 2.0.0-alpha.0 |
| https://helm.elastic.co | elasticsearch | 7.17.3 |
| oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 |
| oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |
Expand Down
24 changes: 12 additions & 12 deletions helm/alfresco-content-services/templates/_helpers-ats.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ Local transformers config
*/}}
{{- define "alfresco-content-services.localTransformConfig" -}}
localTransform.core-aio.url=
localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }}
localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }}
localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }}
localTransform.tika.url=http://{{ template "alfresco-transform-service.tika.name" . }}
localTransform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }}
localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.fullname" . }}
localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.imagemagick.fullname" . }}
localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.libreoffice.fullname" . }}
localTransform.tika.url=http://{{ template "alfresco-transform-service.tika.fullname" . }}
localTransform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.fullname" . }}
{{- end -}}

{{/*
ATS Tengines config
*/}}
{{- define "alfresco-content-services.tengineConfig" -}}
alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }}
img.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }}
jodconverter.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }}
tika.url=http://{{ template "alfresco-transform-service.tika.name" . }}
transform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }}
alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.fullname" . }}
img.url=http://{{ template "alfresco-transform-service.imagemagick.fullname" . }}
jodconverter.url=http://{{ template "alfresco-transform-service.libreoffice.fullname" . }}
tika.url=http://{{ template "alfresco-transform-service.tika.fullname" . }}
transform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.fullname" . }}
{{- end -}}

{{/*
Expand All @@ -30,8 +30,8 @@ Get Alfresco Content Service configuration for Alfresco Transform Service
{{- if and $atsCtx.Values.filestore.enabled $atsCtx.Values.transformrouter.enabled }}
{{- $routerCtx := (dict "Values" (dict "nameOverride" "router" ) "Chart" .Chart "Release" .Release) }}
{{- $sfsCtx := (dict "Values" (dict "nameOverride" "filestore" ) "Chart" .Chart "Release" .Release) }}
transform.service.url=http://{{ template "alfresco-transform-service.transform-router.name" $atsCtx }}
sfs.url=http://{{ template "alfresco-transform-service.filestore.name" $atsCtx }}
transform.service.url=http://{{ template "alfresco-transform-service.transform-router.fullname" $atsCtx }}
sfs.url=http://{{ template "alfresco-transform-service.filestore.fullname" $atsCtx }}
{{ template "alfresco-content-services.tengineConfig" $atsCtx }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ data:
{{- with (index .Values "alfresco-transform-service") }}
{{- $atsCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }}
{{- if and .enabled .filestore.enabled .transformrouter.enabled }}
SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.filestore.name" $atsCtx)) }}
{{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.transform-router.name" $atsCtx)) }}
SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.filestore.fullname" $atsCtx)) }}
{{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.transform-router.fullname" $atsCtx)) }}
{{- if index $.Values "alfresco-search-enterprise" "enabled" }}
{{- include "alfresco-search-enterprise.ats.fullurl" $ats_baseurl | nindent 2 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: {{ printf "%s-tengine-im" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
spec:
scaleTargetRef:
name: {{ template "alfresco-transform-service.imagemagick.name" $atsCtx }}
name: {{ template "alfresco-transform-service.imagemagick.fullname" $atsCtx }}
triggers:
{{- $destQ := "org.alfresco.transform.engine.imagemagick.acs" }}
{{- $targetQSize := $atsCtx.Values.imagemagick.autoscaling.kedaTargetValue | default 10 | toString }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: {{ printf "%s-tengine-lo" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
spec:
scaleTargetRef:
name: {{ template "alfresco-transform-service.libreoffice.name" $atsCtx }}
name: {{ template "alfresco-transform-service.libreoffice.fullname" $atsCtx }}
triggers:
{{- $destQ := "org.alfresco.transform.engine.libreoffice.acs" }}
{{- $targetQSize := $atsCtx.Values.libreoffice.autoscaling.kedaTargetValue | default 10 | toString }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: {{ printf "%s-tengine-misc" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
spec:
scaleTargetRef:
name: {{ template "alfresco-transform-service.transform-misc.name" $atsCtx }}
name: {{ template "alfresco-transform-service.transform-misc.fullname" $atsCtx }}
triggers:
{{- $destQ := "org.alfresco.transform.engine.misc.acs" }}
{{- $targetQSize := $atsCtx.Values.transformmisc.autoscaling.kedaTargetValue | default 10 | toString }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: {{ printf "%s-tengine-pdfrenderer" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
spec:
scaleTargetRef:
name: {{ template "alfresco-transform-service.pdfrenderer.name" $atsCtx }}
name: {{ template "alfresco-transform-service.pdfrenderer.fullname" $atsCtx }}
triggers:
{{- $destQ := "org.alfresco.transform.engine.alfresco-pdf-renderer.acs" }}
{{- $targetQSize := $atsCtx.Values.pdfrenderer.autoscaling.kedaTargetValue | default 10 | toString }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: {{ printf "%s-tengine-tika" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
spec:
scaleTargetRef:
name: {{ template "alfresco-transform-service.tika.name" $atsCtx }}
name: {{ template "alfresco-transform-service.tika.fullname" $atsCtx }}
triggers:
{{- $destQ := "org.alfresco.transform.engine.tika.acs" }}
{{- $targetQSize := $atsCtx.Values.tika.autoscaling.kedaTargetValue | default 10 | toString }}
Expand Down
8 changes: 8 additions & 0 deletions test/autoscaling-hpa-test-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
alfresco-repository:
autoscaling:
enabled: true
maxReplicas: 2
behavior:
scaleUp:
stabilizationWindowSeconds: 10
Loading