From 58bcffcc0954c7ffbf1a062ed026c5cd9c82ea91 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
Date: Mon, 8 Jul 2019 11:14:35 +0200
Subject: [PATCH] [stable/prometheus] Add custom pod labels for prom server
 (#14819)

* Add custom pod labels to prometheus server component.

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>

* Bump chart version.

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>

* Update README.md

Signed-off-by: Maor Friedman <maor.friedman@redhat.com>

* Update Chart.yaml

Signed-off-by: Maor Friedman <maor.friedman@redhat.com>

* Only parse custom labels if they are set.

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>

* Make indentation the same as server labels.

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
---
 stable/prometheus/Chart.yaml                        | 2 +-
 stable/prometheus/README.md                         | 6 ++++--
 stable/prometheus/templates/server-deployment.yaml  | 3 +++
 stable/prometheus/templates/server-statefulset.yaml | 6 ++++++
 stable/prometheus/values.yaml                       | 5 +++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index e0adce7d4f..4d7c756bbb 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus
-version: 8.14.0
+version: 8.14.1
 appVersion: 2.11.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md
index 05703ff5ef..90338080d1 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -275,10 +275,12 @@ Parameter | Description | Default
 `server.persistentVolume.subPath` | Subdirectory of Prometheus server data Persistent Volume to mount | `""`
 `server.emptyDir.sizeLimit` | emptyDir sizeLimit if a Persistent Volume is not used | `""`
 `server.podAnnotations` | annotations to be added to Prometheus server pods | `{}`
-`server.deploymentAnnotations` | annotations to be added to Prometheus server deployment | `{}'
+`server.podLabels` | labels to be added to Prometheus server pods | `{}`
+`server.deploymentAnnotations` | annotations to be added to Prometheus server deployment | `{}`
 `server.replicaCount` | desired number of Prometheus server pods | `1`
 `server.statefulSet.enabled` | If true, use a statefulset instead of a deployment for pod management | `false`
-`server.statefulSet.annotations` | annotations to be added to Prometheus server stateful set | `{}'
+`server.statefulSet.annotations` | annotations to be added to Prometheus server stateful set | `{}`
+`server.statefulSet.labels` | labels to be added to Prometheus server stateful set | `{}`
 `server.statefulSet.podManagementPolicy` | podManagementPolicy of server pods | `OrderedReady`
 `server.statefulSet.headless.annotations` | annotations for Prometheus server headless service | `{}`
 `server.statefulSet.headless.labels` | labels for Prometheus server headless service | `{}`
diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml
index e4a96403ce..1e6987692f 100644
--- a/stable/prometheus/templates/server-deployment.yaml
+++ b/stable/prometheus/templates/server-deployment.yaml
@@ -26,6 +26,9 @@ spec:
     {{- end }}
       labels:
         {{- include "prometheus.server.labels" . | nindent 8 }}
+        {{- if .Values.server.podLabels}}
+        {{ toYaml .Values.server.podLabels | nindent 8 }}
+        {{- end}}
     spec:
 {{- if .Values.server.priorityClassName }}
       priorityClassName: "{{ .Values.server.priorityClassName }}"
diff --git a/stable/prometheus/templates/server-statefulset.yaml b/stable/prometheus/templates/server-statefulset.yaml
index b952590daf..1a3ccc0205 100644
--- a/stable/prometheus/templates/server-statefulset.yaml
+++ b/stable/prometheus/templates/server-statefulset.yaml
@@ -8,6 +8,9 @@ metadata:
 {{- end }}
   labels:
     {{- include "prometheus.server.labels" . | nindent 4 }}
+    {{- if .Values.server.statefulSet.labels}}
+    {{ toYaml .Values.server.statefulSet.labels | nindent 4 }}
+    {{- end}}
   name: {{ template "prometheus.server.fullname" . }}
 spec:
   serviceName: {{ template "prometheus.server.fullname" . }}-headless
@@ -24,6 +27,9 @@ spec:
     {{- end }}
       labels:
         {{- include "prometheus.server.labels" . | nindent 8 }}
+        {{- if .Values.server.statefulSet.labels}}
+        {{ toYaml .Values.server.statefulSet.labels | nindent 8 }}
+        {{- end}}
     spec:
 {{- if .Values.server.affinity }}
       affinity:
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index f4d7e11e9d..b11cb1d326 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -733,6 +733,10 @@ server:
   podAnnotations: {}
     # iam.amazonaws.com/role: prometheus
 
+  ## Labels to be added to Prometheus server pods
+  ##
+  podLabels: {}
+
   ## Use a StatefulSet if replicaCount needs to be greater than 1 (see below)
   ##
   replicaCount: 1
@@ -744,6 +748,7 @@ server:
     enabled: false
 
     annotations: {}
+    labels: {}
     podManagementPolicy: OrderedReady
 
     ## Alertmanager headless service to use for the statefulset