diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 78e48f3..f072fe1 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -34,6 +34,8 @@ spec: remoteRef: {{ if hasSuffix ".core" .prefix }} key: cloudflare-wildcard.core.{{ .global.domain }} + {{ else if hasSuffix ".vh" .prefix }} + key: cloudflare-wildcard.vh.{{ .global.domain }} {{ else }} key: cloudflare-wildcard.{{ .global.domain }} {{ end }} @@ -42,6 +44,8 @@ spec: remoteRef: {{ if hasSuffix ".core" .prefix }} key: cloudflare-wildcard.core.{{ .global.domain }} + {{ else if hasSuffix ".vh" .prefix }} + key: cloudflare-wildcard.vh.{{ .global.domain }} {{ else }} key: cloudflare-wildcard.{{ .global.domain }} {{ end }} diff --git a/k8s/apps/ingresses/templates/clusterissuer.yaml b/k8s/apps/ingresses/templates/clusterissuer.yaml index 71a3035..93a2113 100644 --- a/k8s/apps/ingresses/templates/clusterissuer.yaml +++ b/k8s/apps/ingresses/templates/clusterissuer.yaml @@ -58,9 +58,22 @@ spec: issuerRef: name: cloudflare kind: Issuer - commonName: '*.{{ .Values.global.domain }}' + commonName: '*.core.{{ .Values.global.domain }}' dnsNames: - - "*.{{ .Values.global.domain }}" + - "*.core.{{ .Values.global.domain }}" +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: cloudflare-wildcard.vh.{{ .Values.global.domain }} +spec: + secretName: cloudflare-wildcard.vh.{{ .Values.global.domain }} + issuerRef: + name: cloudflare + kind: Issuer + commonName: '*.vh.{{ .Values.global.domain }}' + dnsNames: + - "*.vh.{{ .Values.global.domain }}" {{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index c3f9175..961daf7 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -1,11 +1,11 @@ -{{ if .Values.secrets.ingresses.secrets.cloudflare }} +{{- if .Values.secrets.ingresses.secrets.cloudflare }} cloudflare: enabled: true tokenSecretName: {{ .Values.secrets.ingresses.secrets.cloudflare.name }} tokenSecretKey: api-token -{{ end }} - +{{- end }} services: + # core services - prefix: "argocd.core" service: "argocd-server" namespace: "argocd" @@ -23,6 +23,10 @@ services: service: prometheus-grafana namespace: chart-prometheus middleware: "apps-ingresses-chain-authentik" + - prefix: "authentik.core" + service: "authentik" + namespace: "chart-authentik" + # root services - prefix: "demo" service: "dummy-app" namespace: "apps-ingresses" @@ -36,17 +40,15 @@ services: service: "plex" namespace: "apps-videohosting" port: 32400 + - prefix: "frigate" + service: "frigate" + namespace: "apps-frigate" + middleware: "apps-ingresses-chain-authentik" + # vh services {{- range $k, $v := .Values.videohosting.linuxserverServices }} - prefix: "{{ $k }}.vh" service: "{{ $k }}" namespace: "apps-videohosting" port: {{ $v.ports.tcp.web }} middleware: "apps-ingresses-chain-authentik" - {{- end }} - - prefix: "frigate" - service: "frigate" - namespace: "apps-frigate" - middleware: "apps-ingresses-chain-authentik" - - prefix: "authentik.core" - service: "authentik" - namespace: "chart-authentik" \ No newline at end of file + {{- end }} \ No newline at end of file