Merge dev into Main

.github/workflows/chart-ci.yaml

@@ -7,9 +7,13 @@ on:
       - "dev"
       - "main"
 
+permissions:
+  contents: write
+  security-events: write
+
 jobs:
   aphp-chart-ci-workflow:
-    uses: aphp/ci-workflows/.github/workflows/chart-ci.yml@main
+    uses: aphp/ci-workflows/.github/workflows/chart-ci.yml@dev
     with:
       kubernetes-version: "1.24.2"
       chart-dir: "charts/redcap"

NOTICE

@@ -1,7 +1,7 @@
 This software contains the following dependencies developed by Broadcom :
 
 - Helm Charts:
-  - mysql : https://github.com/bitnami/charts/tree/main/bitnami/mysql
+  - mariadb : https://github.com/CloudPirates-io/helm-charts/tree/main/charts/mariadb
   - logstash : https://github.com/bitnami/charts/tree/main/bitnami/logstash
 
 Those dependencies are present in the "bitnami/charts" github repository provided by Broadcom under the Apache 2.0 license, 

README.md

@@ -3,7 +3,7 @@
 [![redcap-helmchart-ci](https://github.com/aphp/redcap-helmchart/actions/workflows/chart-ci.yaml/badge.svg)](https://github.com/aphp/redcap-helmchart/actions/workflows/chart-ci.yaml)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/aphp-redcap)](https://artifacthub.io/packages/search?repo=aphp-redcap)
 
-## Presentation
+## Presentation 
 
 This repository hosts the REDCap Helm Chart developed by the Greater Paris University Hospitals (`APHP` in French - Assistance Publique des Hôpitaux de Paris). This Chart allows for a cloud-native and cloud-agnostic deployment of REDCap, a secure web application for building and managing online surveys and databases.
 
@@ -21,7 +21,7 @@ The architecture of the REDCap stack deployed by this Chart is as follows :
 A minimal setup of this stack includes : 
 - The HTTPd component
 - The PHP FPM Server hosting the REDCap Application
-- The MySQL Database used by REDCap
+- The MariaDB Database used by REDCap
 
 On top of that, you can also choose to deploy : 
 - A Backup Cronjob, that can generate an archive containing a database dump, a dump of the `edocs` folder, and a dump of the folder containing the REDCap Application.
@@ -45,7 +45,7 @@ Here are a few important notions to keep in mind to efficiently manage a REDCap
 
 If you choose to automatically install REDCap using your community credentials with this chart, an Kubernetes Job called `init-job` will be automatically fired during the chart's installation process:
 - The `StartupPrope` will call the `install.php` or `upgrade.php` script (depending if you're installing REDCap from scratch or upgrading from an existing installation)  with the query parameter `auto=1`
-- The `ReadinessProbe` will call a MySql script allowing to configure REDCap with the following parameter, extracted from the Chart values :
+- The `ReadinessProbe` will call a MariaDB script allowing to configure REDCap with the following parameter, extracted from the Chart values :
   - REDCap Base URL
   - Institution Name
   - Organization Name

charts/redcap/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
-- name: mysql 
-  repository: https://charts.bitnami.com/bitnami
-  version: 13.0.2
+- name: mariadb
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 0.8.0
 - name: logstash
   repository: https://charts.bitnami.com/bitnami
   version: 7.0.4
-digest: sha256:9acead3f00befe50145d27d120a6795203cc65d72bc6578d1903642884fe1a48
-generated: "2025-06-19T15:34:43.900600074+02:00"
+digest: sha256:f08d201367526ff2189bcba7f2fa3ec712a842dabbd716490414560faeb7b935
+generated: "2025-12-08T16:16:04.913596174+01:00"

charts/redcap/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: redcap
-version: 1.4.5
-appVersion: 14.5.25
+version: 1.5.0
+appVersion: 15.0.27
 kubeVersion: '>= 1.24.0-0'
 description: A Helm chart to deploy REDCap on a Kubernetes cluster.
 type: application
@@ -14,10 +14,10 @@ home: https://www.project-redcap.org/
 sources:
   - https://github.com/aphp/redcap-helmchart
 dependencies:
-  - condition: mysql.enabled
-    name: mysql
-    repository: https://charts.bitnami.com/bitnami
-    version: 13.0.2
+  - condition: mariadb.enabled
+    name: mariadb
+    repository: oci://registry-1.docker.io/cloudpirates
+    version: 0.8.0
   - condition: audit.enabled
     name: logstash
     alias: audit

charts/redcap/charts/.helm_ls_cache/mysql/templates/secondary/configmap.yaml

@@ -3,14 +3,14 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if (include "mysql.secondary.createConfigmap" .) }}
+{{- if (include "mariadb.secondary.createConfigmap" .) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "mysql.secondary.fullname" . }}
+  name: {{ include "mariadb.secondary.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: mysql
+    app.kubernetes.io/part-of: mariadb
     app.kubernetes.io/component: secondary
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

charts/redcap/charts/.helm_ls_cache/mysql/templates/tls-secret.yaml

@@ -5,11 +5,11 @@ SPDX-License-Identifier: APACHE-2.0
 
 {{- $secretName := printf "%s-crt" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
 {{- if and .Values.tls.enabled (eq .Values.tls.autoGenerated.engine "helm") }}
-{{- $ca := genCA "mysql-ca" 365 }}
+{{- $ca := genCA "mariadb-ca" 365 }}
 {{- $releaseNamespace := include "common.names.namespace" . }}
 {{- $clusterDomain := .Values.clusterDomain }}
-{{- $primaryServiceName := include "mysql.primary.fullname" . }}
-{{- $secondaryServiceName := include "mysql.secondary.fullname" . }}
+{{- $primaryServiceName := include "mariadb.primary.fullname" . }}
+{{- $secondaryServiceName := include "mariadb.secondary.fullname" . }}
 {{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
 {{- $altNames := list (printf "*.%s.%s.svc.%s" $primaryServiceName $secondaryServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $secondaryServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (include "common.names.fullname" .) "localhost" "127.0.0.1" }}
 {{- $cert := genSignedCert $primaryServiceName nil $altNames 365 $ca }}
@@ -19,8 +19,8 @@ metadata:
   name: {{ $secretName }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: mysql
-    app.kubernetes.io/component: mysql
+    app.kubernetes.io/part-of: mariadb
+    app.kubernetes.io/component: mariadb
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
@@ -36,8 +36,8 @@ metadata:
   name: {{ $secretName }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: mysql
-    app.kubernetes.io/component: mysql
+    app.kubernetes.io/part-of: mariadb
+    app.kubernetes.io/component: mariadb
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}

charts/redcap/charts/.helm_ls_cache/mysql/templates/update-password/previous-secret.yaml

@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.passwordUpdateJob.enabled (eq ( include "mysql.createPreviousSecret" . ) "true") }}
+{{- if and .Values.passwordUpdateJob.enabled (eq ( include "mariadb.createPreviousSecret" . ) "true") }}
 {{- $rootPassword := .Values.passwordUpdateJob.previousPasswords.rootPassword }}
 {{- $password := .Values.passwordUpdateJob.previousPasswords.password }}
 {{- $replicationPassword := .Values.passwordUpdateJob.previousPasswords.replicationPassword }}
@@ -13,17 +13,17 @@ metadata:
   name: {{ printf "%s-previous-secret" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: mysql
+    app.kubernetes.io/part-of: mariadb
   {{- $defaultAnnotations := dict "helm.sh/hook" "pre-upgrade" "helm.sh/hook-delete-policy" "hook-succeeded" }}
   {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonAnnotations $defaultAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
 type: Opaque
 data:
-  mysql-root-password: {{ required "The previous root password is required!" $rootPassword | b64enc | quote }}
+  mariadb-root-password: {{ required "The previous root password is required!" $rootPassword | b64enc | quote }}
   {{- if .Values.auth.username }}
-  mysql-password: {{ required "The previous user password is required!" $password | b64enc | quote }}
+  mariadb-password: {{ required "The previous user password is required!" $password | b64enc | quote }}
   {{- end }}
   {{- if eq .Values.architecture "replication" }}
-  mysql-replication-password: {{ required "The previous replication password is required!" $replicationPassword | b64enc | quote }}
+  mariadb-replication-password: {{ required "The previous replication password is required!" $replicationPassword | b64enc | quote }}
   {{- end }}
 {{- end }}

charts/redcap/ci/ct-values.yaml

@@ -11,7 +11,7 @@ redcap:
   install:
     enabled: false
 
-mysql:
+mariadb:
   primary:
     resources:
       requests:

charts/redcap/configuration/audit/redcap-log-event.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event2.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event3.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event4.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event5.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event6.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event7.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event8.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-event9.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/audit/redcap-log-view.conf

@@ -1,9 +1,9 @@
 input { 
 
   jdbc {
-    jdbc_driver_library => "/driver/mysql-connector-j-8.4.0.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mysql.primary.service.ports.mysql }}/{{ .Values.redcap.config.database.auth.databaseName }}"
+    jdbc_driver_library => "/driver/mariadb-connector-j-8.4.0.jar"
+    jdbc_driver_class => "com.mariadb.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mariadb://{{ .Values.redcap.config.database.auth.hostname }}:{{ default 3306 .Values.mariadb.service.port }}/{{ .Values.redcap.config.database.auth.databaseName }}"
     jdbc_user => "{{ .Values.redcap.config.database.auth.username }}"
     jdbc_password => "{{ default .Values.redcap.config.database.auth.password `${MYSQL_PASSWD}` }}"
     schedule => "{{ .Values.audit.logsApi.config.pollingSchedule }}"

charts/redcap/configuration/httpd/httpd.conf

@@ -122,7 +122,7 @@ PidFile /var/run/supervisor/httpd.pid
 # as error documents.  e.g. admin@your-domain.com
 #
 ServerAdmin {{ .Values.redcap.config.adminMail }}
-ServerName {{ .Values.redcap.config.externalURL }}
+ServerName {{ include `httpd.externalDomain` . }}
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -377,8 +377,9 @@ EnableSendfile on
     <IfModule proxy_fcgi_module>
 
         # Maps the fastcgi server to the root URL space
+        DirectorySlash On
         ProxyPassMatch "^/(.*\.php(/.*)?)$" "fcgi://{{ include `redcap.serviceName` . }}:{{ .Values.services.redcap.port }}/var/www/redcap/$1" timeout=3600 enablereuse=on
-        DirectoryIndex /index.php index.php
+        DirectoryIndex index.php #/index.php
 
     </IfModule>