Make the use of existingClaim along with enterprise impossible.

In enterprise mode, the user can scale beyond 1 replica and therefore should in no case use existingClaim. The if statements around the data volume/volumeClaimTemplate has been adjusted as such. Signed-off-by: Naseem <naseem@transit.app>

Make the use of existingClaim along with enterprise impossible.
e82f8560 · Naseem · Naseem · 2774a172 · e82f8560
Commit e82f8560 authored Mar 11, 2020 by Naseem Committed by Naseem Mar 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

statefulset.yaml charts/influxdb/templates/statefulset.yaml +4 -2

No files found.
--- a/charts/influxdb/templates/statefulset.yaml
+++ b/charts/influxdb/templates/statefulset.yaml
@@ -126,12 +126,14 @@ spec:
      - name: {{ include "influxdb.fullname" . }}-data
        emptyDir: {}
      {{- end }}
-      {{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+      # Cannot use existing claim in enterprise mode
+      {{- if and .Values.persistence.enabled .Values.persistence.existingClaim (not .Values.enterprise.enabled) }}
      - name: {{ include "influxdb.fullname" . }}-data
        persistentVolumeClaim:
          claimName: {{ .Values.persistence.existingClaim }}
      {{- end }}
-  {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+  # Must use volume claim template in enterprise mode
+  {{- if and .Values.persistence.enabled (or (not .Values.persistence.existingClaim) .Values.enterprise.enabled) }}
  volumeClaimTemplates:
    - metadata:
        name: {{ include "influxdb.fullname" . }}-data