Fix bug with pvc and volume mounts.

Signed-off-by: gscho <greg@geldata.com>

Author: gscho

charts/gel-server/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: gel-server
 description: A Helm chart for running gel-server on Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "7.0"

charts/gel-server/templates/deployment.yaml

@@ -95,11 +95,13 @@ spec:
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
-          {{- range .Values.extraEnvFromSecrets }}
+          {{- if .Values.extraEnvFromSecrets }}
           envFrom:
+          {{- range .Values.extraEnvFromSecrets }}
             - secretRef:
                 name: {{ .name }}
           {{- end }}
+          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe:
             {{- toYaml . | nindent 12 }}
@@ -112,7 +114,6 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- if or .Values.config.security.tls.existingSecret .Values.volumeMounts }}
           volumeMounts:
             - name: gel-data
               mountPath: /var/lib/gel/data
@@ -123,20 +124,18 @@ spec:
             {{- end }}
 
             {{- with .Values.volumeMounts }}
-            {{- toYaml . | nindent 2 }}
+            {{- toYaml . | nindent 12 }}
             {{- end }}
-          {{- end }}
-      {{- if or .Values.config.security.tls.existingSecret .Values.volumeMounts }}
       volumes:
         - name: gel-data
         {{- if .Values.persistence.existingClaim }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.persistence.existingClaim }}
         {{- else if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ include "gel-server.fullname" . }}-data
+          persistentVolumeClaim:
+            claimName: {{ include "gel-server.fullname" . }}-data
         {{- else }}
-        emptyDir: {}
+          emptyDir: {}
         {{- end }}
         {{- if .Values.config.security.tls.existingSecret }}
         - name: tls
@@ -146,7 +145,6 @@ spec:
       {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/gel-server/values.yaml

@@ -39,8 +39,8 @@ config:
       # existingSecret: "gel-tls-cert"  # name of secret containing tls.crt / tls.key
 
 extraEnv: {}
-  # GEL_DOCKER_LOG_LEVEL: "enabled"
-  # GEL_DEBUG_HTTP_INJECT_CORS: 1
+  # Full list of environment variables: https://docs.geldata.com/reference/running/configuration
+  # GEL_DOCKER_LOG_LEVEL: "info"
 
 # extraEnvFromSecrets:
 #   - name: gel-db-creds