From 94da2f2b371ae25f3f0d8425c026a41d710e0d4d Mon Sep 17 00:00:00 2001 From: Kevin Jing Qiu Date: Thu, 15 Jun 2017 09:37:37 -0400 Subject: [PATCH 1/4] Added `accessLogs` section for traefik config --- stable/traefik/templates/configmap.yaml | 7 +++++++ stable/traefik/values.yaml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/stable/traefik/templates/configmap.yaml b/stable/traefik/templates/configmap.yaml index db25629765f5..f06989f69941 100644 --- a/stable/traefik/templates/configmap.yaml +++ b/stable/traefik/templates/configmap.yaml @@ -47,6 +47,13 @@ data: labelselector = {{ .Values.kubernetes.labelSelector | quote }} {{- end}} {{- end}} + {{- if .Values.accessLogs.enabled }} + [accessLogs] + {{- if .Values.accessLogs.filePath }} + filePath = "{{ .Values.accessLogs.filePath }}" + {{- end}} + format = "{{ .Values.accessLogs.format }}" + {{- end}} {{- if .Values.acme.enabled }} [acme] email = "{{ .Values.acme.email }}" diff --git a/stable/traefik/values.yaml b/stable/traefik/values.yaml index 23b750d5a2dc..424604a9f748 100644 --- a/stable/traefik/values.yaml +++ b/stable/traefik/values.yaml @@ -42,6 +42,10 @@ service: # key: value gzip: enabled: true +accessLogs: + enabled: false + filePath: "" # if empty, stdout is used + format: "common" # choices are: common, json # Kubernetes ingress filters #kubernetes: # namespaces: From 2bc223253029e58eb02ba4bc92963356e4639dff Mon Sep 17 00:00:00 2001 From: Kevin Jing Qiu Date: Thu, 15 Jun 2017 09:40:41 -0400 Subject: [PATCH 2/4] Update Traefik chart README --- stable/traefik/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stable/traefik/README.md b/stable/traefik/README.md index eb823203374d..cb90f5b8da31 100644 --- a/stable/traefik/README.md +++ b/stable/traefik/README.md @@ -115,6 +115,9 @@ The following tables lists the configurable parameters of the Traefik chart and | `gzip.enabled` | Whether to use gzip compression | `true` | | `kubernetes.namespaces` | List of Kubernetes namespaces to watch | All namespaces | | `kubernetes.labelSelector` | Valid Kubernetes ingress label selector to watch (e.g `realm=public`)| No label filter | +| `accessLogs.enabled` | Whether to enable Traefik's access logs | `false` | +| `accessLogs.filePath` | The path to the log file. Logs to stdout if omitted | None | +| `accessLogs.format` | What format the log entries shold be in. Either common or json | `common` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example: From 6213524ae5f1261da85745fc2b53ee002593f45d Mon Sep 17 00:00:00 2001 From: Kevin Jing Qiu Date: Thu, 15 Jun 2017 13:36:38 -0400 Subject: [PATCH 3/4] Fix typos and format consistency issues --- stable/traefik/README.md | 2 +- stable/traefik/values.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stable/traefik/README.md b/stable/traefik/README.md index cb90f5b8da31..9d4b0d006924 100644 --- a/stable/traefik/README.md +++ b/stable/traefik/README.md @@ -117,7 +117,7 @@ The following tables lists the configurable parameters of the Traefik chart and | `kubernetes.labelSelector` | Valid Kubernetes ingress label selector to watch (e.g `realm=public`)| No label filter | | `accessLogs.enabled` | Whether to enable Traefik's access logs | `false` | | `accessLogs.filePath` | The path to the log file. Logs to stdout if omitted | None | -| `accessLogs.format` | What format the log entries shold be in. Either common or json | `common` | +| `accessLogs.format` | What format the log entries should be in. Either `common` or `json` | `common` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example: diff --git a/stable/traefik/values.yaml b/stable/traefik/values.yaml index 424604a9f748..bef902bce4d6 100644 --- a/stable/traefik/values.yaml +++ b/stable/traefik/values.yaml @@ -44,8 +44,9 @@ gzip: enabled: true accessLogs: enabled: false - filePath: "" # if empty, stdout is used - format: "common" # choices are: common, json + ## Path to the access logs file. If not provided, Traefik defaults it to stdout. + # filePath: "" + format: common # choices are: common, json # Kubernetes ingress filters #kubernetes: # namespaces: From 036cfa135e44f6deee2983fc45cd80c1c89f36d2 Mon Sep 17 00:00:00 2001 From: Kevin Jing Qiu Date: Thu, 15 Jun 2017 13:37:51 -0400 Subject: [PATCH 4/4] Increment Traefik chart minor version --- stable/traefik/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml index f2533fba13a8..45877e0f3c9a 100755 --- a/stable/traefik/Chart.yaml +++ b/stable/traefik/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: traefik -version: 1.3.0 +version: 1.4.0 appVersion: 1.2.1 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support keywords: