diff --git a/charts/apps/ingress/templates/_helpers/certificate.tpl b/charts/apps/ingress/templates/_helpers/certificate.tpl index ab47bfb..4bf0ed1 100644 --- a/charts/apps/ingress/templates/_helpers/certificate.tpl +++ b/charts/apps/ingress/templates/_helpers/certificate.tpl @@ -3,13 +3,13 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: cloudflare-wildcard{{.prefix}}{{ .root }}.{{ .domain }} + name: cloudflare-wildcard{{.prefix | default ""}}{{ .root }}.{{ .domain }} spec: - secretName: cloudflare-wildcard{{.prefix}}{{ .root }}.{{ .domain }} + secretName: cloudflare-wildcard{{.prefix | default ""}}{{ .root }}.{{ .domain }} issuerRef: name: cloudflare kind: Issuer - commonName: '*{{.prefix}}{{ .root }}.{{ .domain }}' + commonName: '*{{.prefix | default ""}}{{ .root }}.{{ .domain }}' dnsNames: - - "*{{.prefix}}{{ .root }}.{{ .domain }}" + - "*{{.prefix | default ""}}{{ .root }}.{{ .domain }}" {{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/templates/clusterissuer.yaml b/charts/apps/ingress/templates/clusterissuer.yaml index 57166f0..35bf5f8 100644 --- a/charts/apps/ingress/templates/clusterissuer.yaml +++ b/charts/apps/ingress/templates/clusterissuer.yaml @@ -40,8 +40,8 @@ spec: {{include "homelab.cert" (merge $.Values.global.dns.secondary (dict "prefix" $prefix))}} {{ end }} -{{include "homelab.cert" (merge $.Values.global.dns.primary (dict "prefix" ""))}} -{{include "homelab.cert" (merge $.Values.global.dns.secondary (dict "prefix" ""))}} +{{include "homelab.cert" $.Values.global.dns.primary}} +{{include "homelab.cert" $.Values.global.dns.secondary}} --- apiVersion: cert-manager.io/v1 kind: Certificate