From 291b553638797ec10ba55cd4929b03904013611a Mon Sep 17 00:00:00 2001
From: DutchEllie <personal@quenten.nl>
Date: Sat, 12 Mar 2022 19:26:04 +0100
Subject: [PATCH] Moved values

---
 .drone.yml                               |  5 +----
 .drone/helm/chart/templates/ingress.yaml |  8 ++++++--
 .drone/helm/chart/values.yaml            |  8 +++++---
 .drone/helm/staging-val.yaml             | 13 +++++++++++++
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 .drone/helm/staging-val.yaml

diff --git a/.drone.yml b/.drone.yml
index 040f996..b5e0405 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,10 +30,7 @@ steps:
     skip_tls_verify: true
     values_files:
       - .drone/helm/values.yaml
-    values:
-      - ingress.tls.host: newsite.staging.dutchellie.nl
-      - ingress.hosts: 
-          - host: newsite.staging.dutchellie.nl
+      - .drone/helm/staging-val.yaml
     kube_api_server:
       from_secret: staging_api_server
     kube_token:
diff --git a/.drone/helm/chart/templates/ingress.yaml b/.drone/helm/chart/templates/ingress.yaml
index a7c9ca8..44ae7bc 100644
--- a/.drone/helm/chart/templates/ingress.yaml
+++ b/.drone/helm/chart/templates/ingress.yaml
@@ -10,9 +10,13 @@ spec:
   ingressClassName: {{ .Values.ingress.className }}
 {{- if .Values.ingress.tls }}
   tls:
+  {{- range .Values.ingress.tls }}
     - hosts:
-        - {{ .Values.ingress.tls.host }}
-      secretName: {{ .Values.ingress.tls.secretName }}
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
 {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
diff --git a/.drone/helm/chart/values.yaml b/.drone/helm/chart/values.yaml
index 4806436..c9f7d2c 100644
--- a/.drone/helm/chart/values.yaml
+++ b/.drone/helm/chart/values.yaml
@@ -15,9 +15,11 @@ ingress:
   name: newsite-ingress
   annotations: {}
   className: nginx
-  tls: 
-    host: example.com
-    secretName: newsite-tls  
+  tls: []
+  # tls:
+  # - hosts:
+  #   - example.com
+  #   secretName: example-tls
   hosts:
     - host: example.com
       paths:
diff --git a/.drone/helm/staging-val.yaml b/.drone/helm/staging-val.yaml
new file mode 100644
index 0000000..61ed806
--- /dev/null
+++ b/.drone/helm/staging-val.yaml
@@ -0,0 +1,13 @@
+name: newsite-staging
+service: newsite-staging
+ingress:
+  name: newsite-staging
+  tls:
+    - hosts:
+        - newsite.staging.dutchellie.nl
+      secretName: newsite-staging-tls
+  hosts:
+    - host: newsite.staging.dutchellie.nl
+      paths:
+        - path: /
+          pathType: Prefix
\ No newline at end of file