diff --git a/k8s/apps/ingresses/templates/clusterissuer.yaml b/k8s/apps/ingresses/templates/clusterissuer.yaml index ffc7db1..060bff8 100644 --- a/k8s/apps/ingresses/templates/clusterissuer.yaml +++ b/k8s/apps/ingresses/templates/clusterissuer.yaml @@ -12,7 +12,29 @@ spec: privateKeySecretRef: name: {{ .Values.global.tls.issuer }} solvers: - - http01: - ingress: - class: traefik + - http01: + ingress: + class: traefik + +{{ if .Values.cloudflare.enabled }} +--- +apiVersion: cert-manager.io/v1 +kind: ClusterIssuer +metadata: + name: cloudflare +spec: + acme: + server: {{ .Values.global.tls.acmeServer }} + skipTLSVerify: {{ .Values.global.tls.skipTLSVerify }} + email: {{ .Values.global.email }} + privateKeySecretRef: + name: cloudflare + solvers: + - dns01: + cloudflare: + apiTokenSecretRef: + name: {{ .Values.cloudflare.apiKeySecretName }} + key: {{ .Values.cloudflare.apiKeySecretKey }} + +{{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/apps/ingresses/values.yaml b/k8s/apps/ingresses/values.yaml index 60f2244..8d890ab 100644 --- a/k8s/apps/ingresses/values.yaml +++ b/k8s/apps/ingresses/values.yaml @@ -7,3 +7,7 @@ services: service: "dummy-app" namespace: "apps-ingresses" middleware: "apps-ingresses-forwardauth-authentik" +cloudflare: + enabled: false + apiKeySecretName: ~ + apiKeySecretKey: ~ diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 1ccc966..d61f9ca 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -1,3 +1,10 @@ +{{ if .Values.secrets.ingresses.secrets.cloudflare }} +cloudflare: + enabled: true + apiKeySecretName: {{ .Values.secrets.ingresses.secrets.cloudflare.name }} + apiKeySecretKey: api-token +{{ end }} + services: - prefix: "argocd.core" service: "argocd-server" diff --git a/k8s/argoapps/values-prod.yaml b/k8s/argoapps/values-prod.yaml index d8298da..2b35fe4 100644 --- a/k8s/argoapps/values-prod.yaml +++ b/k8s/argoapps/values-prod.yaml @@ -14,4 +14,10 @@ global: familyvideos: "/mnt/EightTerra/FamilyStorage/Video" mqtt: username: k3s - password: fZ!HauNB9% \ No newline at end of file + password: fZ!HauNB9% + +secrets: + ingresses: + secrets: + cloudflare: + name: "cloudflare.apikey" diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 7e9bfe5..77d36f0 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -129,6 +129,9 @@ infrastructureCharts: valuesFile: authentik.yaml secrets: + ingresses: + namespace: apps-ingresses + secrets: {} database: enableClusterStore: true namespace: chart-database