diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index c2ea971bb42..545546cdb19 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 22.0.3 +version: 22.1.0 annotations: truecharts.org/category: network truecharts.org/SCALE-support: "true" diff --git a/charts/enterprise/traefik/templates/_tlsstore.tpl b/charts/enterprise/traefik/templates/_tlsstore.tpl new file mode 100644 index 00000000000..17908e29201 --- /dev/null +++ b/charts/enterprise/traefik/templates/_tlsstore.tpl @@ -0,0 +1,26 @@ +{{/* Define the tlsOptions */}} +{{- define "traefik.tlsstore" -}} +{{- if .Values.defaultCertificate }} +--- +apiVersion: traefik.io/v1alpha1 +kind: TLSStore +metadata: + name: default +spec: + certificates: + - secretName: clusterissuer-templated-{{ tpl .Values.defaultCertificate $ }} + defaultCertificate: + secretName: clusterissuer-templated-{{ tpl .Values.defaultCertificate $ }} +{{- end }} + +{{- range $name, $config := .Values.tlsStore }} + +--- +apiVersion: traefik.io/v1alpha1 +kind: TLSStore +metadata: + name: {{ $name }} +spec: + {{- toYaml $config | nindent 2 }} +{{- end }} +{{- end }} diff --git a/charts/enterprise/traefik/templates/common.yaml b/charts/enterprise/traefik/templates/common.yaml index d70a9887a47..d00c5ec4cc2 100644 --- a/charts/enterprise/traefik/templates/common.yaml +++ b/charts/enterprise/traefik/templates/common.yaml @@ -7,6 +7,7 @@ {{- $_ := set $.Values.workload.main.podSpec.containers.main "args" $mergedargs -}} {{- include "traefik.portalhook" . }} +{{- include "traefik.tlsstore" . }} {{- include "traefik.tlsOptions" . }} {{- include "traefik.ingressRoute" . }} {{- include "traefik.ingressClass" . }} diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml index b3f73ad87e1..402e0e37081 100644 --- a/charts/enterprise/traefik/values.yaml +++ b/charts/enterprise/traefik/values.yaml @@ -134,6 +134,13 @@ globalArguments: additionalArguments: - "--serverstransport.insecureskipverify=true" - "--providers.kubernetesingress.allowexternalnameservices=true" + +# -- Default clusterCertificate generated by clusterissuer +defaultCertificate: "" + +# -- Add custom DNSStore objects +tlsStore: {} + # -- TLS Options to be created as TLSOption CRDs # https://doc.traefik.io/tccr.io/truecharts/https/tls/#tls-options # Example: