From b529370bdb08a9cd25dee2d7fbde139ce211c63c Mon Sep 17 00:00:00 2001
From: Mohamad Berjawi <mohamad.fberjawi@gmail.com>
Date: Wed, 11 Dec 2024 14:19:08 +0300
Subject: [PATCH 1/2] (fix)[uwazi] duplicate volumes definition

---
 charts/base/Chart.yaml                 |  2 +-
 charts/base/templates/application.yaml | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
index e61473b..7d76b23 100644
--- a/charts/base/Chart.yaml
+++ b/charts/base/Chart.yaml
@@ -14,5 +14,5 @@ maintainers:
     url: https://github.com/jordanopensource/charts/
 sources:
   - https://github.com/jordanopensource/charts/tree/main/charts/base
-version: 1.2.0
+version: 1.2.1
 appVersion: 1.0.1
diff --git a/charts/base/templates/application.yaml b/charts/base/templates/application.yaml
index ce722b0..876dcf4 100644
--- a/charts/base/templates/application.yaml
+++ b/charts/base/templates/application.yaml
@@ -85,7 +85,7 @@ spec:
             - name: app-data
               mountPath: {{ .Values.workload.persistence.path }}
               {{- if .Values.workload.persistence.subPath }}
-              subPath: {{ .Values.master.persistence.subPath }}
+              subPath: {{ .Values.workload.persistence.subPath }}
               {{- end }}
             {{- if .Values.workload.volumeMounts }}
             {{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumeMounts "context" $) | nindent 12 }}
@@ -96,20 +96,19 @@ spec:
           {{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumeMounts "context" $) | nindent 12 }}
           {{- end }}
           {{- end }}
-      {{- if .Values.workload.volumes }}
-      volumes: {{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumes "context" $) | nindent 8 }}
-      {{- end }}
-  {{- if .Values.workload.persistence.enabled }}
+  {{- if or .Values.workload.persistence.enabled .Values.workload.volumes }}
       volumes:
+      {{- if .Values.workload.persistence.enabled }}
       {{- if .Values.workload.persistence.existingClaim }}
         - name: app-data
           persistentVolumeClaim:
-            claimName: {{ .Values.workload.persistence.existingClaim . }}
+            claimName: {{ .Values.workload.persistence.existingClaim }}
       {{- else }}
         - name: app-data
           persistentVolumeClaim:
             claimName: {{ include "base.names.fullname" . }}
       {{- end }}
+      {{- end }}
       {{- if .Values.workload.volumes }}
       {{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumes "context" $) | nindent 8 }}
       {{- end }}
@@ -147,4 +146,4 @@ spec:
         dataSource: {{- include "base.tplvalues.render" (dict "value" .Values.workload.persistence.datasource "context" $) | nindent 10 }}
         {{- end }}
   {{- end }}
-  {{- end }}
+  {{- end }}
\ No newline at end of file

From 62ee5278e2be5505ec4c506152988ab0682a6594 Mon Sep 17 00:00:00 2001
From: Mohamad Berjawi <mohamad.fberjawi@gmail.com>
Date: Wed, 11 Dec 2024 14:20:55 +0300
Subject: [PATCH 2/2] [uwazi](application.yaml) add end of line

---
 charts/base/templates/application.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/base/templates/application.yaml b/charts/base/templates/application.yaml
index 876dcf4..2d276c5 100644
--- a/charts/base/templates/application.yaml
+++ b/charts/base/templates/application.yaml
@@ -146,4 +146,4 @@ spec:
         dataSource: {{- include "base.tplvalues.render" (dict "value" .Values.workload.persistence.datasource "context" $) | nindent 10 }}
         {{- end }}
   {{- end }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}