From 5e33ddfb4a0d660583717d78719a7aff3a2f994a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 3 May 2023 03:55:49 +0000 Subject: [PATCH] added core service ingress support --- .../ingresses/templates/_helpers/ingress.yaml | 9 +++++ .../ingresses/templates/clusterissuer.yaml | 13 +++++++ .../templates/middleware-common.yaml | 35 ------------------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 3af1da1..f733e98 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -32,9 +32,18 @@ spec: data: - secretKey: tls.crt remoteRef: + {{ if hasSuffix ".core" .prefix }} + key: cloudflare-wildcard.core.{{ .global.domain }} + {{ else }} key: cloudflare-wildcard.{{ .global.domain }} + {{ end }} property: tls.crt - secretKey: tls.key + {{ if hasSuffix ".core" .prefix }} + key: cloudflare-wildcard.core.{{ .global.domain }} + {{ else }} + key: cloudflare-wildcard.{{ .global.domain }} + {{ end }} remoteRef: key: cloudflare-wildcard.{{ .global.domain }} property: tls.key diff --git a/k8s/apps/ingresses/templates/clusterissuer.yaml b/k8s/apps/ingresses/templates/clusterissuer.yaml index e73782c..71a3035 100644 --- a/k8s/apps/ingresses/templates/clusterissuer.yaml +++ b/k8s/apps/ingresses/templates/clusterissuer.yaml @@ -48,6 +48,19 @@ spec: commonName: '*.{{ .Values.global.domain }}' dnsNames: - "*.{{ .Values.global.domain }}" +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: cloudflare-wildcard.core.{{ .Values.global.domain }} +spec: + secretName: cloudflare-wildcard.core.{{ .Values.global.domain }} + issuerRef: + name: cloudflare + kind: Issuer + commonName: '*.{{ .Values.global.domain }}' + dnsNames: + - "*.{{ .Values.global.domain }}" {{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/apps/ingresses/templates/middleware-common.yaml b/k8s/apps/ingresses/templates/middleware-common.yaml index fdc5813..e67ff27 100644 --- a/k8s/apps/ingresses/templates/middleware-common.yaml +++ b/k8s/apps/ingresses/templates/middleware-common.yaml @@ -23,41 +23,6 @@ spec: stsPreload: true forceSTSHeader: true --- - ---- -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: chain-authelia - namespace: "{{ .Release.Namespace }}" -spec: - chain: - middlewares: - - name: https-redirect - namespace: "{{ .Release.Namespace }}" - - name: forwardauth-authelia - namespace: "{{ .Release.Namespace }}" - ---- -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: forwardauth-authelia - namespace: "{{ .Release.Namespace }}" - labels: - app.kubernetes.io/instance: authelia - app.kubernetes.io/name: authelia -spec: - forwardAuth: - address: http://main-authelia.apps-authelia.svc.cluster.local/api/verify?rd=https%3A%2F%2Fauth.core.{{.Values.global.domain}}%2F - authResponseHeaders: - - Remote-User - - Remote-Name - - Remote-Email - - Remote-Groups - - ---- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: