Updated

Chart/templates/certificate.yaml

@@ -1,3 +1,4 @@
+{{- if and .Values.site.certificate .Values.site.certificate.certManager }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -6,17 +7,21 @@ metadata:
         {{- include "..labels" . | nindent 8 }}
 spec:
     issuerRef:
-        name: cloudyne-internal-root-v2
-        kind: ClusterIssuer
+        name: {{ .Values.site.certificate.issuerRef }}
+        kind: {{ .Values.site.certificate.issuerKind }}
     secretName: {{ include "..fullname" . }}-cert-secret
-    commonName: {{ .Values.site.url }}
-    dnsNames:
-        - {{ .Values.site.domain | replace "www." "" }}
-        - www.{{ .Values.site.domain | replace "www." "" }}
-        - {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-        - www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-{{- if .Values.site.additionalIngressDomains  }}
-    {{- range .Values.site.additionalIngressDomains }}
-        - {{ . }}
-    {{- end }}
-{{- end }}
+    commonName: {{ .Values.site.domain }}
+    dnsNames: {{ include "..domains" . | nindent 8 }}
+{{- else if and .Values.site.certificate .Values.site.certificate.custom .Values.site.certificate.custom.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+    name: {{ include "..fullname" . }}-cert-secret
+    labels:
+        {{- include "..labels" . | nindent 8 }}
+type: kubernetes.io/tls
+data:
+  tls.crt: {{ .Values.site.certificate.custom.cert | b64enc }}
+  tls.key: {{ .Values.site.certificate.custom.key | b64enc }}
+{{- else }}
+{{- end }}