Fix on conflicting secrets

ConductionNL · Dec 11, 2019 · ed9f8a5 · ed9f8a5
1 parent 06075d0
commit ed9f8a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/api/helm/templates/certificate.yaml b/api/helm/templates/certificate.yaml
@@ -1,16 +1,11 @@
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
-  name: {{ include "name" . }}-acme-cert
+  name: {{ include "name" . }}-{{ .Values.settings.env }}-cert
 spec:
-  secretName: {{ include "name" . }}-tls-cert
+  secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
   duration: 24h
   renewBefore: 12h
-  {{- if eq .Values.settings.env "prod" }}
-  commonName: {{ .Values.settings.name }}.{{ .Values.settings.domain }}    
-  {{- else }}      
-  commonName: {{ .Values.settings.name }}.{{ .Values.settings.env }}.{{ .Values.settings.domain }}    
-  {{- end }}
   dnsNames:
   {{- if eq .Values.settings.env "prod" }}
   - {{ .Values.settings.name }}.{{ .Values.settings.domain }}    

diff --git a/api/helm/templates/ingress.yaml b/api/helm/templates/ingress.yaml
@@ -19,8 +19,11 @@ metadata:
 spec:
   tls: 
   - hosts:
+    #  {{- range .Values.settings.domains }}
+    #    - {{ .domain | quote }}
+    #  {{- end }}
     - {{ .Values.settings.domain }}
-    secretName: {{ include "name" . }}-tls-cert
+    secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
   rules:
 #    - host: {{ .Values.settings.name }}.{{ .Values.settings.env }}.{{ .Values.settings.domain }}
 #      http:

diff --git a/api/templates/helm/Values.yaml.twig b/api/templates/helm/Values.yaml.twig
@@ -13,7 +13,7 @@ settings:
   domain: {{ app_domain }}  
   domains:
 {% for domain in app_domains %}
-    - {{ domain }}
+    - domain: {{ domain }}
 {% endfor %}
   organisationName: {{ organization_name }}
   email: {{ organization_email }}