From f575a3ee086d50be6bef8bfcfcdf2071167a705d 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] [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 ++++++++++
 xenit-alfresco/values.yaml                            |  3 ++-
 3 files changed, 14 insertions(+), 3 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
diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
index 5f52d2b..d2daf9b 100644
--- a/xenit-alfresco/values.yaml
+++ b/xenit-alfresco/values.yaml
@@ -21,6 +21,7 @@ general:
 
 ingress:
   protocol: 'https'
+  host: 'alfresco.example.com'
   ingressAnnotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-production"
@@ -278,7 +279,7 @@ persistentStorage:
     efs:
       volumeHandle: ""
   mq:
-    enabled: true
+    enabled: false
     initVolumes: true
     storageClassName: ""
     storage: 1