diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index fc40ebc..97e747c 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -8,10 +8,33 @@ # global: map (should be .global) # port: int = 80 # path: str = "/" +# useWildCard: bool = False # middleware: str = "https-redirect" # {{ if .global.tls.enabled }} +{{ if .useWildCard }} +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: {{ printf "%s-%s" $value.name $ekey | lower | replace "_" "-" }} + namespace: {{ $secretsData.namespace }} +spec: + refreshInterval: 1h + secretStoreRef: + kind: ClusterSecretStore + name: apps-ingresses + target: + name: tls-{{.prefix}}.{{.global.domain}} + creationPolicy: Owner + deletionPolicy: Delete + data: + - secretKey: cloudflare-wildcard.{{ .Values.global.domain }} + remoteRef: + key: tls.key + property: tls.key +{{ else }} --- apiVersion: cert-manager.io/v1 kind: Certificate @@ -27,6 +50,7 @@ spec: dnsNames: - "{{.prefix}}.{{.global.domain}}" {{ end }} +{{ end }} --- apiVersion: networking.k8s.io/v1 diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index d61f9ca..8e6b8c7 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -27,6 +27,7 @@ services: service: "dummy-app" namespace: "apps-ingresses" middleware: "apps-ingresses-chain-authentik" + useWildCard: true - prefix: "nextcloud" service: "nextcloud" namespace: "apps-nextcloud" diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 77d36f0..da2cc9f 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -130,6 +130,7 @@ infrastructureCharts: secrets: ingresses: + enableClusterStore: true namespace: apps-ingresses secrets: {} database: