[stable/grafana] add pod labels as configuration option (#17614)

* [stable/grafana] add pod labels as configuration option

Signed-off-by: Miles Pool <miles@landinsight.io>

* [stable/grafana] fix whitespace issues

Signed-off-by: Miles Pool <miles@landinsight.io>
This commit is contained in:
Miles Pool
2019-10-02 18:22:08 -07:00
committed by Kubernetes Prow Robot
parent 0dff70eb41
commit d4e2858498
4 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 3.8.16
version: 3.8.17
appVersion: 6.3.5
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
+1
View File
@@ -94,6 +94,7 @@ The command removes all the Kubernetes components associated with the chart and
| `annotations` | Deployment annotations | `{}` |
| `labels` | Deployment labels | `{}` |
| `podAnnotations` | Pod annotations | `{}` |
| `podLabels` | Pod labels | `{}` |
| `podPortName` | Name of the grafana port on the pod | `grafana` |
| `sidecar.image` | Sidecar image | `kiwigrid/k8s-sidecar:0.1.20` |
| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` |
+3
View File
@@ -31,6 +31,9 @@ spec:
labels:
app: {{ template "grafana.name" . }}
release: {{ .Release.Name }}
{{- with .Values.podLabels }}
{{ toYaml . | indent 8 }}
{{- end }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
checksum/dashboards-json-config: {{ include (print $.Template.BasePath "/dashboards-json-configmap.yaml") . | sha256sum }}
+3
View File
@@ -90,6 +90,9 @@ downloadDashboards:
## Pod Annotations
# podAnnotations: {}
## Pod Labels
# podLabels: {}
podPortName: grafana
## Deployment annotations