Merge pull request #75 from guillomep/fix_volume_statefullset

Fix volume on statefullset
jp-gouin · Oct 12, 2022 · 50de567 · 50de567
2 parents e7f9269 + 1f32a46
commit 50de567
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -13,7 +13,7 @@ dependencies:
       - bitnami-common
     version: 1.x.x
 home: https://www.openldap.org
-version: 3.0.1
+version: 3.0.2
 appVersion: 2.4.57
 description: Community developed LDAP software
 icon: https://raw.githubusercontent.com/jp-gouin/helm-openldap/master/logo.png

diff --git a/templates/statefullset.yaml b/templates/statefullset.yaml
@@ -223,13 +223,6 @@ spec:
 {{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 8 }}
 {{- end }}
       volumes:
-{{- if .Values.persistence.enabled }}
-{{- if .Values.persistence.existingClaim }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ .Values.persistence.existingClaim }}
-{{- end }}
-{{- end }}
 {{- if .Values.customLdifFiles }}
         - name: custom-ldif-files
           configMap:
@@ -251,7 +244,12 @@ spec:
         {{- if .Values.extraVolumes }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
-{{- if (not .Values.persistence.existingClaim) }}
+{{- if .Values.persistence.enabled }}
+{{- if .Values.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ .Values.persistence.existingClaim }}
+{{- else }}
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -273,6 +271,7 @@ spec:
       {{- else }}
         storageClassName: "{{ .Values.persistence.storageClass }}"
       {{- end }}
+      {{- end }}
 {{- end }}
 {{- else }}
         - name: data