Skip to content

Commit f93b87e

Browse files
authored
(fix)[uwazi] duplicate volumes definition (#67)
* (fix)[uwazi] duplicate volumes definition * [uwazi](application.yaml) add end of line
1 parent ca743b8 commit f93b87e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

charts/base/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ maintainers:
1414
url: https://github.com/jordanopensource/charts/
1515
sources:
1616
- https://github.com/jordanopensource/charts/tree/main/charts/base
17-
version: 1.2.0
17+
version: 1.2.1
1818
appVersion: 1.0.1

charts/base/templates/application.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
- name: app-data
8686
mountPath: {{ .Values.workload.persistence.path }}
8787
{{- if .Values.workload.persistence.subPath }}
88-
subPath: {{ .Values.master.persistence.subPath }}
88+
subPath: {{ .Values.workload.persistence.subPath }}
8989
{{- end }}
9090
{{- if .Values.workload.volumeMounts }}
9191
{{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumeMounts "context" $) | nindent 12 }}
@@ -96,20 +96,19 @@ spec:
9696
{{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumeMounts "context" $) | nindent 12 }}
9797
{{- end }}
9898
{{- end }}
99-
{{- if .Values.workload.volumes }}
100-
volumes: {{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumes "context" $) | nindent 8 }}
101-
{{- end }}
102-
{{- if .Values.workload.persistence.enabled }}
99+
{{- if or .Values.workload.persistence.enabled .Values.workload.volumes }}
103100
volumes:
101+
{{- if .Values.workload.persistence.enabled }}
104102
{{- if .Values.workload.persistence.existingClaim }}
105103
- name: app-data
106104
persistentVolumeClaim:
107-
claimName: {{ .Values.workload.persistence.existingClaim . }}
105+
claimName: {{ .Values.workload.persistence.existingClaim }}
108106
{{- else }}
109107
- name: app-data
110108
persistentVolumeClaim:
111109
claimName: {{ include "base.names.fullname" . }}
112110
{{- end }}
111+
{{- end }}
113112
{{- if .Values.workload.volumes }}
114113
{{- include "base.tplvalues.render" ( dict "value" .Values.workload.volumes "context" $) | nindent 8 }}
115114
{{- end }}

0 commit comments

Comments
 (0)