Merge pull request #9 from ConductionNL/staging

ingres updates
ConductionNL · Dec 12, 2019 · e4e3f81 · e4e3f81
2 parents 395e932 + c2912e6
commit e4e3f81
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 142 deletions.
diff --git a/api/helm/helm/Chart.yaml.twig b/api/helm/helm/Chart.yaml.twig
diff --git a/api/helm/helm/Values.yaml.twig b/api/helm/helm/Values.yaml.twig
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
@@ -12,15 +12,14 @@ metadata:
     helm.sh/chart: {{ include "chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 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:
@@ -32,20 +31,14 @@ spec:
     - host: {{ .Values.settings.domain }}
       http:
         paths:
-          - path: /.well-known/*
-            backend:
-              serviceName: {{ include "name" . }}-letsencrypt
-              servicePort: 80
-          - path: /*
-            backend:
+          - backend:
               serviceName: {{ include "name" . }}
               servicePort: 80
     {{- else }}      
     - host: {{ .Values.settings.env }}.{{ .Values.settings.domain }}
       http:
         paths:
-          - path: /*
-            backend:
+          - backend:
               serviceName: {{ include "name" . }}
               servicePort: 80
      {{- end }}