From 2eeb2413db82cba32df29b4084d98a05347423ad Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Tue, 6 Nov 2018 06:58:18 +0100
Subject: [PATCH] updated ingress configuration

---
 charts/rstudio/templates/ingress.yaml | 10 +---------
 charts/rstudio/values.yaml            |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/charts/rstudio/templates/ingress.yaml b/charts/rstudio/templates/ingress.yaml
index 891ba50..5df123a 100644
--- a/charts/rstudio/templates/ingress.yaml
+++ b/charts/rstudio/templates/ingress.yaml
@@ -18,15 +18,7 @@ metadata:
     {{- end }}
 spec:
   rules:
-  {{- if .Values.environment -eq "development" }}
-  - host: "analysis.dev.molgenis.org"
-  {{- else if .Values.environment -eq "test" }}
-  - host: "analysis.test.molgenis.org"
-  {{- else if .Values.environment -eq "acceptance" }}
-  - host: "analysis.accept.molgenis.org"
-  {{- else }}
-  - host: "analysis.molgenis.org"
-  {{- end }}
+  - host: {{ .name }}
     http:
       paths:
         - path: {{ default "/" .path }}
diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml
index f1bab92..9686917 100644
--- a/charts/rstudio/values.yaml
+++ b/charts/rstudio/values.yaml
@@ -7,7 +7,6 @@ replicaCount: 1
 environment: production
 
 rstudio:
-  environment: development
   name: rstudio
   strategy:
     type: Recreate
@@ -30,7 +29,7 @@ ingress:
   }
   path: /
   hosts:
-  - name: analysis.molgenis.org
+  - name: analysis.dev.molgenis.org
   tls: []
 
 nodeSelector: {}