From 809b4369f7c5d717d1dbe5d79b38fb9359cc39e5 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Vrielynck <43749206+pvriel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:08:23 +0200
Subject: [PATCH 1/3] [KANSUP74-23] allow ActiveMQ to have additional / cusom
 PVs & PVCs

---
 .../templates/active-mq/mq-deployment.yaml    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/xenit-alfresco/templates/active-mq/mq-deployment.yaml b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
index 59f40af..ba1ac1f 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployment.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
@@ -84,6 +84,16 @@ spec:
               mountPath: /opt/activemq/data
               subPath: mq/data
           {{- end }}
+          {{- if .Values.persistentStorage.mq.additionalClaims }}
+          {{- range .Values.persistentStorage.mq.additionalClaims }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
+          {{- end }}
+          {{- end }}
+          {{- if .Values.mq.additionalVolumeMounts }}
+          {{- toYaml .Values.mq.additionalVolumeMounts | nindent 12 }}
+          {{- end }}
       {{- if .Values.persistentStorage.mq.initVolumes }}
       initContainers:
         - name: init-fs
@@ -115,4 +125,14 @@ spec:
           persistentVolumeClaim:
             claimName: mq-pvc
       {{- end }}
+        {{- if .Values.persistentStorage.mq.additionalClaims }}
+      {{- range .Values.persistentStorage.mq.additionalClaims }}
+        - name: {{ .name }}
+          persistentVolumeClaim:
+            claimName: {{ .name }}-pvc
+      {{- end }}
+        {{- end }}
+        {{- if .Values.mq.additionalVolumes }}
+        {{- toYaml .Values.mq.additionalVolumes | nindent 8 }}
+        {{- end }}
 {{- end }}
\ No newline at end of file

From ba191e0dd8eab219bb7bab30697b497202084ff2 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Vrielynck <43749206+pvriel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:16:35 +0200
Subject: [PATCH 2/3] [KANSUP74-23] updated README with additional
 configuration options

---
 README.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/README.md b/README.md
index 16dc616..20c429c 100644
--- a/README.md
+++ b/README.md
@@ -1076,6 +1076,26 @@ Digital Workspace are disabled.
 * Description: If you use an image that is not public. then you can create dockerconfigjson secrets on your cluster and
   reference them here.
 
+#### `mq.additionalVolumes`
+* Required: false
+* Default: None
+* Description: A list of additional volumes for the mq pods. Example:
+```yaml
+      - name: activemq-data-1
+        persistentVolumeClaim:
+          claimName: alfresco-pvc-1
+```
+
+#### `mq.additionalVolumeMounts`
+* Required: false
+* Default: None
+* Description: A list of additional volume mounts for the mq pods. Example:
+```yaml
+      - name: activemq-data-1
+        mountPath: /mountpath
+        subPath: subpath
+```
+
 ### Postgresql
 
 #### `postgresql.enabled`
@@ -2270,3 +2290,18 @@ additional settings can be added through additionalEnvironmentVariables.
 * Required: when `persistentStorage.mq.storageClassName` is `scw-bssd`
 * Default: None
 * Description: The volume handle pointing to the AWS EFS location
+
+### `persistentStorage.mq.additionalClaims`
+* Required: false
+* Default: None
+* Description: A list of additional volume claims that can be added to the mq pods. Layout should be as follows:
+
+```yaml
+      - name: name1
+        mountPath: /apps/example
+        subPath: subPath/example
+        storageClassName: "standard"
+        storage: 2
+        efs:
+          volumeHandle: "efs-identifier"
+```
\ No newline at end of file

From 15459941029a121e7f62b5f35047446225046528 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Vrielynck <43749206+pvriel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:53:03 +0200
Subject: [PATCH 3/3] [KANSUP74-23] fixed additional bugs for ActiveMQ PVCs

---
 xenit-alfresco/templates/active-mq/mq-deployment.yaml |  4 ++--
 xenit-alfresco/templates/storage/mq-volumes.yaml      | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xenit-alfresco/templates/active-mq/mq-deployment.yaml b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
index ba1ac1f..d83f860 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployment.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
@@ -78,8 +78,8 @@ spec:
             {{ toYaml .Values.mq.resources.limits | nindent 14 }}
             {{- end }}
           {{- end }}
-          {{- if .Values.persistentStorage.mq.enabled }}
           volumeMounts:
+          {{- if .Values.persistentStorage.mq.enabled }}
             - name: data
               mountPath: /opt/activemq/data
               subPath: mq/data
@@ -119,8 +119,8 @@ spec:
         {{- if .Values.mq.imagePullSecrets}}
         {{ toYaml .Values.mq.imagePullSecrets | nindent 8 }}
         {{- end }}
-      {{- if .Values.persistentStorage.mq.enabled }}
       volumes:
+      {{- if .Values.persistentStorage.mq.enabled }}
         - name: data
           persistentVolumeClaim:
             claimName: mq-pvc
diff --git a/xenit-alfresco/templates/storage/mq-volumes.yaml b/xenit-alfresco/templates/storage/mq-volumes.yaml
index 75a676a..12c07ce 100644
--- a/xenit-alfresco/templates/storage/mq-volumes.yaml
+++ b/xenit-alfresco/templates/storage/mq-volumes.yaml
@@ -8,5 +8,15 @@
 {{- $efsVolumeHandle := .efs.volumeHandle -}}
 {{- include "hepers.volumeHelper" (list $namespace $name $storageClassName $storage $efsVolumeHandle) }}
 {{- end }}
+{{- if .additionalClaims }}
+{{- range .additionalClaims }}
+{{- $name := .name -}}
+{{- $storageClassName := .storageClassName -}}
+{{- $storage := .storage -}}
+{{- $efsVolumeHandle := .efs.volumeHandle -}}
+{{- include "hepers.volumeHelper" (list $namespace $name $storageClassName $storage $efsVolumeHandle) }}
+---
+{{- end }}
+{{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file