updated postgres instances and firewall configuration

molgenis/questions.yml

@@ -42,16 +42,15 @@ questions:
   group: "Provisioning"
   show_subquestion_if: true
   subquestions:
-  - variable: service.firewall.umcg.enabled
+  - variable: service.firewall.kind
-    default: false
+    default: "umcg"
-    description: "Firewall within the UMCG environment"
+    description: "Firewall kind. This can be 'umcg' or 'cluster' environment"
-    type: boolean
+    type: enum
-    label: Firewall UMCG enabled
+    required: true
-  - variable: service.firewall.cluster.enabled
+    options:
-    default: false
+    - umcg
-    description: "Firewall within the cluster environment"
+    - cluster
-    type: boolean
+    label: Firewall kind
-    label: Firewall cluster enabled
 - variable: molgenis.services.opencpu.host
   label: OpenCPU cluster
   default: "localhost"

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

molgenis/values.yaml

@@ -6,12 +6,11 @@ service:
   type: LoadBalancer
   firewall:
     enabled: false
+    kind: "umcg"
     umcg:
-      enabled: false
       rules:
       - 127.0.0.1/32
     cluster:
-      enabled: false
       rules:
       - 127.0.0.1/32
   port: 8080