From 6a34b4b3d6639d1002cfbce15bda4c15fe223b6d Mon Sep 17 00:00:00 2001 From: Ryan Orth Date: Tue, 20 Aug 2019 12:50:49 -0700 Subject: [PATCH 1/2] [stable/traefik] Updated acme storage location to be configurable Signed-off-by: Ryan Orth --- stable/traefik/Chart.yaml | 2 +- stable/traefik/README.md | 1 + stable/traefik/templates/configmap.yaml | 2 +- stable/traefik/values.yaml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml index cca44134a5b0..1a4b4643cfab 100644 --- a/stable/traefik/Chart.yaml +++ b/stable/traefik/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: traefik -version: 1.76.1 +version: 1.77.0 appVersion: 1.7.12 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support keywords: diff --git a/stable/traefik/README.md b/stable/traefik/README.md index 785b74fcb960..6755b4e9c3e9 100644 --- a/stable/traefik/README.md +++ b/stable/traefik/README.md @@ -160,6 +160,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 45ac7f72b5cc..8603d985e7cd 100644 --- a/stable/traefik/templates/configmap.yaml +++ b/stable/traefik/templates/configmap.yaml @@ -269,7 +269,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 572c411d02b6..50a8f52b62f5 100644 --- a/stable/traefik/values.yaml +++ b/stable/traefik/values.yaml @@ -160,6 +160,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: From 9a9891c2f3e2800d3a1bf1a8c967b980a86f3f95 Mon Sep 17 00:00:00 2001 From: Ryan Orth Date: Sun, 25 Aug 2019 18:41:39 -0700 Subject: [PATCH 2/2] Fixed wrong version update Signed-off-by: Ryan Orth --- stable/traefik/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml index 1a798a232efe..38a3309be639 100644 --- a/stable/traefik/Chart.yaml +++ b/stable/traefik/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: traefik -version: 1.77.0 -appVersion: 1.7.15 +version: 1.78.0 +appVersion: 1.7.14 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support keywords: