updated postgres instances and firewall configuration

molgenis/templates/persistence/postgresPVC.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.molgenis.services.postgres.embedded -}}
+{{- if (.Values.molgenis.services.postgres.embedded) and (.Values.persistence.enabled) }}
 apiVersion: extensions/v1beta1
 kind: PersistentVolumeClaim
 apiVersion: v1

molgenis/templates/service.yaml

@@ -11,16 +11,15 @@ spec:
   type: {{ .Values.service.type }}
 {{- if .Values.service.firewall.enabled }}
   loadBalancerSourceRanges:
-{{- if .Values.service.firewall.umcg.enabled }}
+{{- if .Values.service.firewall.kind eq "umcg" }}
     {{- range $index, $rule := .Values.service.firewall.umcg.rules }}
     - {{ $rule }}
     {{- end }}
-{{- if .Values.service.firewall.cluster.enabled }}
+{{- else }}
     {{- range $index, $rule := .Values.service.firewall.cluster.rules }}
     - {{ $rule }}
     {{- end }}
 {{- end }}
-{{- end }}
 {{- end }}
   ports:
     - name: molgenis