[stable/traefik] allow labels and annotations to be specified (#16917)

* [stable/traefik] allow labels and annotations to be specified

Signed-off-by: Nick Roberts (nickrobertssky) <nick.roberts@sky.uk>

* [stable/traefik] bump chart version

Signed-off-by: Nick Roberts (nickrobertssky) <nick.roberts@sky.uk>

* [stable/traefik] add new values to readme

Signed-off-by: Nick Roberts (nickrobertssky) <nick.roberts@sky.uk>

* [stable/traefik] fix issue when labels no specified

Signed-off-by: Nick Roberts (nickrobertssky) <nick.roberts@sky.uk>
This commit is contained in:
Nick Roberts
2019-10-16 07:51:40 -07:00
committed by Kubernetes Prow Robot
parent e243b996ff
commit af96abbe10
4 changed files with 15 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: traefik
version: 1.78.2
version: 1.78.3
appVersion: 1.7.14
description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
+2
View File
@@ -213,6 +213,8 @@ The following table lists the configurable parameters of the Traefik chart and t
| `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 deployment. | None |
| `deployment.podLabels` | Labels for the Traefik deployment. | None |
| `deployment.podAnnotations` | Annotations for the Traefik pod definition | None |
| `deployment.podLabels` | Labels for the Traefik pod definition | None |
| `deployment.hostPort.httpEnabled` | Whether to enable hostPort binding to host for http. | `false` |
+7
View File
@@ -11,6 +11,13 @@ metadata:
chart: {{ template "traefik.chart" . }}
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
{{- if .Values.deployment.labels }}
{{- toYaml .Values.deployment.labels | nindent 4 }}
{{- end }}
{{- with .Values.deployment.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: {{ default 1 .Values.replicas }}
selector:
+5
View File
@@ -429,6 +429,11 @@ metrics:
# address: localhost:8125
# pushinterval: 10s
deployment:
# labels to add to the deployment
# labels:
# key: value
# annotations:
# key: value
# labels to add to the pod container metadata
# podLabels:
# key: value