(fix)[uwazi] duplicate volumes definition (#67)

* (fix)[uwazi] duplicate volumes definition * [uwazi](application.yaml) add end of line
jordanopensource · Dec 11, 2024 · f93b87e · f93b87e
1 parent ca743b8
commit f93b87e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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 }}