From 6f995f45bd130f65be1943a5e2fb8e1737ed9659 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Wed, 26 Sep 2018 16:52:06 +0200
Subject: [PATCH] updated postgres instances and firewall configuration

---
 molgenis/questions.yml                        | 19 +++++++++----------
 .../templates/persistence/postgresPVC.yaml    |  2 +-
 molgenis/templates/service.yaml               |  5 ++---
 molgenis/values.yaml                          |  3 +--
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/molgenis/questions.yml b/molgenis/questions.yml
index 14665fd..f62f9a7 100644
--- a/molgenis/questions.yml
+++ b/molgenis/questions.yml
@@ -42,16 +42,15 @@ questions:
   group: "Provisioning"
   show_subquestion_if: true
   subquestions:
-  - variable: service.firewall.umcg.enabled
-    default: false
-    description: "Firewall within the UMCG environment"
-    type: boolean
-    label: Firewall UMCG enabled
-  - variable: service.firewall.cluster.enabled
-    default: false
-    description: "Firewall within the cluster environment"
-    type: boolean
-    label: Firewall cluster enabled
+  - variable: service.firewall.kind
+    default: "umcg"
+    description: "Firewall kind. This can be 'umcg' or 'cluster' environment"
+    type: enum
+    required: true
+    options:
+    - umcg
+    - cluster
+    label: Firewall kind
 - variable: molgenis.services.opencpu.host
   label: OpenCPU cluster
   default: "localhost"
diff --git a/molgenis/templates/persistence/postgresPVC.yaml b/molgenis/templates/persistence/postgresPVC.yaml
index ff6348c..098d806 100644
--- a/molgenis/templates/persistence/postgresPVC.yaml
+++ b/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
diff --git a/molgenis/templates/service.yaml b/molgenis/templates/service.yaml
index 5596315..f9b9d85 100644
--- a/molgenis/templates/service.yaml
+++ b/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
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index b45976d..c9fa30c 100644
--- a/molgenis/values.yaml
+++ b/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