[ stable/traefik] Allow usage of metrics without dashboard (#3366)

* Add config checksum and podAnnotations

* Allow usage of metrics without dashboard

* Bump version 1.17.0
This commit is contained in:
Etienne
2018-01-19 21:38:27 -08:00
committed by k8s-ci-robot
parent 9cea3cab63
commit 501b4165d3
5 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: traefik
version: 1.16.1
version: 1.17.0
appVersion: 1.4.6
description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
keywords:
+2 -1
View File
@@ -112,7 +112,7 @@ The following tables lists the configurable parameters of the Traefik chart and
| `acme.persistence.accessMode` | `ReadWriteOnce` or `ReadOnly` | `ReadWriteOnce` |
| `acme.persistence.size` | Minimum size of the volume requested | `1Gi` |
| `dashboard.enabled` | Whether to enable the Traefik dashboard | `false` |
| `dashboard.domain` | Domain for the Traefik dashboard | `traefik.example.com` |
| `dashboard.domain` | Domain for the Traefik dashboard | `traefik.example.com` |
| `dashboard.service.annotations` | Annotations for the Traefik dashboard Service definition, specified as a map | None |
| `dashboard.ingress.annotations` | Annotations for the Traefik dashboard Ingress definition, specified as a map | None |
| `dashboard.ingress.labels` | Labels for the Traefik dashboard Ingress definition, specified as a map | None |
@@ -136,6 +136,7 @@ The following tables lists the configurable parameters of the Traefik chart and
| `metrics.statsd.enabled` | Whether to enable pushing metrics to Statsd. | `false` |
| `metrics.statsd.address` | Statsd host in the format <hostname>:<port> | `localhost:8125` |
| `metrics.statsd.pushInterval` | How often to push metrics to Statsd. | `10s` |
| `deployment.podAnnotations` | Annotations for the Traefik pod definition | None |
| `deployment.hostPort.httpEnabled` | Whether to enable hostPort binding to host for http. | `false` |
| `deployment.hostPort.httpsEnabled` | Whether to enable hostPort binding to host for https. | `false` |
| `deployment.hostPort.dashboardEnabled` | Whether to enable hostPort binding to host for dashboard. | `false` |
+3 -1
View File
@@ -75,9 +75,11 @@ data:
acmeLogging = true
{{- end }}
{{- end }}
{{- if .Values.dashboard.enabled }}
{{- if or .Values.dashboard.enabled .Values.metrics.prometheus.enabled .Values.metrics.statsd.enabled .Values.metrics.datadog.enabled }}
[web]
address = ":8080"
{{- end }}
{{- if .Values.dashboard.enabled }}
{{- if .Values.dashboard.auth }}
{{- if .Values.dashboard.auth.basic }}
[web.auth.basic]
+5 -1
View File
@@ -14,10 +14,14 @@ spec:
app: {{ template "fullname" . }}
template:
metadata:
{{- if and (.Values.tolerations) (le .Capabilities.KubeVersion.Minor "5") }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
{{- if and (.Values.tolerations) (le .Capabilities.KubeVersion.Minor "5") }}
scheduler.alpha.kubernetes.io/tolerations: '{{ toJson .Values.tolerations }}'
{{- end }}
{{- range $key, $value := .Values.deployment.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
app: {{ template "fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+2
View File
@@ -105,6 +105,8 @@ metrics:
# address: localhost:8125
# pushinterval: 10s
deployment:
# podAnnotations:
# key: value
hostPort:
httpEnabled: false
httpsEnabled: false