Merge pull request #84 from imZack/fix-existingClaim

fix: existingClaim not working
smallstep · Feb 18, 2022 · e37bbcd · e37bbcd
2 parents 8a9685b + 21aa803
commit e37bbcd
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/step-certificates/templates/ca.yaml b/step-certificates/templates/ca.yaml
@@ -171,6 +171,11 @@ spec:
       - name: database
         emptyDir: {}
       {{- end }}
+      {{- if and .Values.ca.db.enabled (and .Values.ca.db.persistent .Values.ca.db.existingClaim) }}
+      - name: database
+        persistentVolumeClaim:
+          claimName: {{ .Values.ca.db.existingClaim }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -183,7 +188,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-  {{- if and .Values.ca.db.enabled .Values.ca.db.persistent }}
+  {{- if and .Values.ca.db.enabled .Values.ca.db.persistent (not .Values.ca.db.existingClaim) }}
   volumeClaimTemplates:
   - metadata:
       name: database
@@ -199,17 +204,11 @@ spec:
       resources:
         requests:
           storage: {{ .Values.ca.db.size | quote }}
-      {{ if .Values.ca.db.existingClaim }}
-      selector:
-        matchLabels:
-          name: {{ .Values.ca.db.existingClaim | quote }}
-      {{- else }}
       {{- if .Values.ca.db.storageClass }}
       {{- if (eq "-" .Values.ca.db.storageClass) }}
       storageClassName: ""
       {{- else }}
       storageClassName: {{ .Values.ca.db.storageClass | quote }}
       {{- end }}
       {{- end }}
-      {{- end }}
   {{- end }}