update version and remove unused manual helm index cruft

apache · Jan 15, 2023 · 81f4ef7 · 81f4ef7
1 parent a893ca7
commit 81f4ef7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: couchdb
-version: 3.6.3
+version: 4.1.0
 appVersion: 3.2.1
 description: A database featuring seamless multi-master sync, that scales from
   big data to mobile, with an intuitive HTTP/JSON API and designed for

diff --git a/couchdb/templates/persistentvolume.yaml b/couchdb/templates/persistentvolume.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.persistentVolume.enabled and .Values.persistentVolume.existing -}}
+{{- if and .Values.persistentVolume.enabled .Values.persistentVolume.existing -}}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -9,12 +9,13 @@ spec:
   storageClassName: ""
 {{- else }}
   storageClassName: "{{ .Values.persistentVolume.storageClass }}"
+{{- end }}
 {{- end }}
   accessModes:
   {{- range .Values.persistentVolume.accessModes }}
     - {{ . | quote }}
   {{- end }}
   capacity:
     storage: {{ .Values.persistentVolume.size }}
-  {{ toYaml .Values.persistentVolume.volumeSource | indent 2 }}
+{{ toYaml .Values.persistentVolume.volumeSource | indent 2 }}
 {{- end }}
diff --git a/couchdb/templates/persistentvolumeclaim.yaml b/couchdb/templates/persistentvolumeclaim.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.persistentVolume.enabled and .Values.persistentVolume.existing -}}
+{{- if and .Values.persistentVolume.enabled .Values.persistentVolume.existing -}}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -18,12 +18,12 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistentVolume.size | quote }}
-  {{- if .Values.persistentVolume.storageClass }}
-  {{- if (eq "-" .Values.persistentVolume.storageClass) }}
-    storageClassName: ""
-  {{- else }}
-    storageClassName: "{{ .Values.persistentVolume.storageClass }}"
-  {{- end }}
-  {{- end }}
+{{- if .Values.persistentVolume.storageClass }}
+{{- if (eq "-" .Values.persistentVolume.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistentVolume.storageClass }}"
+{{- end }}
+{{- end }}
   volumeName: {{ .Values.persistentVolume.volumeName }}
 {{- end }}
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
@@ -202,10 +202,10 @@ spec:
 {{- if not .Values.persistentVolume.enabled }}
         - name: database-storage
           emptyDir: {}
-{{- else if .Values.persistentVolume.enabled and .Values.persistentVolume.existing }}
+{{- else if and .Values.persistentVolume.enabled .Values.persistentVolume.existing }}
         - name: database-storage
           persistentVolumeClaim:
-            claimName: {{ .Values.persistentVolume.ClaimName }}
+            claimName: {{ .Values.persistentVolume.claimName }}
 {{- else }}
   volumeClaimTemplates:
     - metadata: