From 4b32e554dca736c6987669c32c2d3d2043c7e8fd Mon Sep 17 00:00:00 2001
From: DutchEllie <personal@quenten.nl>
Date: Wed, 29 Jun 2022 15:06:12 +0200
Subject: [PATCH] Change chart

---
 .drone/helm/chart/Chart.yaml             |  2 +-
 .drone/helm/chart/templates/ingress.yaml | 12 ++++++------
 .drone/helm/chart/templates/service.yaml |  2 +-
 .drone/helm/prod-val.yaml                | 15 ++++++++-------
 .drone/helm/staging-val.yaml             | 15 ++++++++-------
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.drone/helm/chart/Chart.yaml b/.drone/helm/chart/Chart.yaml
index 5aa2d31..6cd3a3b 100644
--- a/.drone/helm/chart/Chart.yaml
+++ b/.drone/helm/chart/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: newsite
-version: v0.0.1
\ No newline at end of file
+version: v0.0.2
\ No newline at end of file
diff --git a/.drone/helm/chart/templates/ingress.yaml b/.drone/helm/chart/templates/ingress.yaml
index 776f979..c23926b 100644
--- a/.drone/helm/chart/templates/ingress.yaml
+++ b/.drone/helm/chart/templates/ingress.yaml
@@ -1,11 +1,11 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Values.ingress.name }}
+  name: {{ tpl .Values.ingress.name . }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- tpl (. | toYaml) $  | nindent 4 }}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
@@ -14,14 +14,14 @@ spec:
   {{- range .Values.ingress.tls }}
     - hosts:
       {{- range .hosts }}
-        - {{ . | quote }}
+        - {{ tpl . $ | quote }}
       {{- end }}
-      secretName: {{ .secretName }}
+      secretName: {{ tpl (.secretName | toYaml) $ }}
   {{- end }}
 {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ tpl .host $ | quote }}
       http:
         paths:
           {{- range .paths }}
@@ -29,7 +29,7 @@ spec:
             pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ $.Values.service.name }}
+                name: {{ tpl $.Values.service.name $ }}
                 port:
                   number: 8000
           {{- end }}
diff --git a/.drone/helm/chart/templates/service.yaml b/.drone/helm/chart/templates/service.yaml
index 3310517..1a8c8c9 100644
--- a/.drone/helm/chart/templates/service.yaml
+++ b/.drone/helm/chart/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ tpl .Values.service.name . }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.service.annotations }}
   annotations:
diff --git a/.drone/helm/prod-val.yaml b/.drone/helm/prod-val.yaml
index 43ae903..2ea1925 100644
--- a/.drone/helm/prod-val.yaml
+++ b/.drone/helm/prod-val.yaml
@@ -1,23 +1,24 @@
+baseURL: quenten.nl
 name: newsite-prod
 containerEnv:
   - name: APIURL
     value: https://api.quenten.nl/api
 service:
-  name: newsite-prod
+  name: "{{ .Values.name }}"
 ingress:
-  name: newsite-prod
+  name: "{{ .Values.name }}"
   annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    external-dns.alpha.kubernetes.io/hostname: "quenten.nl"
+    cert-manager.io/cluster-issuer: "letsencrypt-{{ .Values.name }}"
+    external-dns.alpha.kubernetes.io/hostname: "{{ .Values.baseURL }}"
     nginx.ingress.kubernetes.io/configuration-snippet: |   
       add_header Content-Security-Policy "frame-ancestors 'self' https://forestofunix.xyz";
       proxy_hide_header X-Frame-Options ;
   tls:
     - hosts:
-        - quenten.nl
-      secretName: newsite-tls
+        - "{{ .Values.baseURL }}"
+      secretName: "{{ .Values.name }}-tls"
   hosts:
-    - host: quenten.nl
+    - host: "{{ .Values.baseURL }}"
       paths:
         - path: /
           pathType: Prefix
\ No newline at end of file
diff --git a/.drone/helm/staging-val.yaml b/.drone/helm/staging-val.yaml
index b464915..a4c6e1c 100644
--- a/.drone/helm/staging-val.yaml
+++ b/.drone/helm/staging-val.yaml
@@ -1,23 +1,24 @@
+baseURL: staging.quenten.nl
 name: newsite-staging
 containerEnv:
   - name: APIURL
     value: https://api.quenten.nl/api/testing
 service:
-  name: newsite-staging
+  name: "{{ .Values.name }}"
 ingress:
-  name: newsite-staging
+  name: "{{ .Values.name }}"
   annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-staging
-    external-dns.alpha.kubernetes.io/hostname: "staging.quenten.nl"
+    cert-manager.io/cluster-issuer: "letsencrypt-{{ .Values.name }}"
+    external-dns.alpha.kubernetes.io/hostname: "{{ .Values.baseURL }}"
     nginx.ingress.kubernetes.io/configuration-snippet: |   
       add_header Content-Security-Policy "frame-ancestors 'self' https://forestofunix.xyz";
       proxy_hide_header X-Frame-Options ;
   tls:
     - hosts:
-        - staging.quenten.nl
-      secretName: newsite-staging-tls
+        - "{{ .Values.baseURL }}"
+      secretName: "{{ .Values.name }}-tls"
   hosts:
-    - host: staging.quenten.nl
+    - host: "{{ .Values.baseURL }}"
       paths:
         - path: /
           pathType: Prefix
\ No newline at end of file