From 907617d8f459f08c0874f423d051d2cbcc8c1980 Mon Sep 17 00:00:00 2001 From: ryaneorth Date: Wed, 11 Sep 2019 14:48:35 -0700 Subject: [PATCH] [stable/traefik] Updated acme storage location to be configurable (#16464) * [stable/traefik] Updated acme storage location to be configurable Signed-off-by: Ryan Orth * Fixed wrong version update Signed-off-by: Ryan Orth --- stable/traefik/Chart.yaml | 3 ++- stable/traefik/README.md | 1 + stable/traefik/templates/configmap.yaml | 2 +- stable/traefik/values.yaml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml index e33c9e0c861f..38a3309be639 100644 --- a/stable/traefik/Chart.yaml +++ b/stable/traefik/Chart.yaml @@ -1,7 +1,8 @@ apiVersion: v1 name: traefik -version: 1.77.5 +version: 1.78.0 appVersion: 1.7.14 + description: A Traefik based Kubernetes ingress controller with Let's Encrypt support keywords: - traefik diff --git a/stable/traefik/README.md b/stable/traefik/README.md index 110c9745463b..7e24ad1ac117 100644 --- a/stable/traefik/README.md +++ b/stable/traefik/README.md @@ -161,6 +161,7 @@ The following table lists the configurable parameters of the Traefik chart and t | `acme.persistence.existingClaim` | An Existing PVC name | `nil` | | `acme.persistence.size` | Minimum size of the volume requested | `1Gi` | | `kvprovider.storeAcme` | Store acme certificates in KV Provider (needed for [HA](https://docs.traefik.io/configuration/acme/#as-a-key-value-store-entry)) | `false` | +| `kvprovider.acmeStorageLocation` | Path for storing acme data | `traefik/acme/account` | | `kvprovider.importAcme` | Import acme certificates from acme.json of a mounted pvc (see: acme.persistence.existingClaim) | `false` | | `kvprovider.$name.endpoint` | Endpoint of the provider like \:\ | None | | `kvprovider.$name.watch` | Wether traefik should watch for changes | `true` | diff --git a/stable/traefik/templates/configmap.yaml b/stable/traefik/templates/configmap.yaml index 4c2277a50948..3a76330e41f2 100644 --- a/stable/traefik/templates/configmap.yaml +++ b/stable/traefik/templates/configmap.yaml @@ -272,7 +272,7 @@ data: KeyType = {{ .Values.acme.keyType | quote }} email = {{ .Values.acme.email | quote }} {{- if .Values.kvprovider.storeAcme }} - storage = "traefik/acme/account" + storage = "{{ .Values.kvprovider.acmeStorageLocation }}" {{- if .Values.kvprovider.importAcme }} storageFile = "/acme/acme.json" {{- end }} diff --git a/stable/traefik/values.yaml b/stable/traefik/values.yaml index f0c3ba39c0a4..7d644e6116c0 100644 --- a/stable/traefik/values.yaml +++ b/stable/traefik/values.yaml @@ -162,6 +162,7 @@ kvprovider: ## storeAcme has to be enabled to support HA Support using acme, but at least one kvprovider is needed storeAcme: false + acmeStorageLocation: traefik/acme/account importAcme: false # etcd: