From 0ba41eedee95adcbaf371fb6cca01bd86e322a88 Mon Sep 17 00:00:00 2001
From: Sandeep Mendiratta <smendiratta@yahoo.com>
Date: Tue, 10 Jul 2018 11:06:28 -0500
Subject: [PATCH] Deployment annotations (#6496)

* added annotations for kube state and server deployments

* bumped up the chart version

* corection

* update readme.md for annotations
---
 stable/prometheus/Chart.yaml                                  | 2 +-
 stable/prometheus/README.md                                   | 2 ++
 .../prometheus/templates/kube-state-metrics-deployment.yaml   | 4 ++++
 stable/prometheus/templates/server-deployment.yaml            | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index be0c60eaf6..52f6a932cf 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 6.8.0
+version: 6.8.1
 appVersion: 2.3.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 ceb768c246..d39361e89d 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -150,6 +150,7 @@ Parameter | Description | Default
 `kubeStateMetrics.args` | kube-state-metrics container arguments | `{}`
 `kubeStateMetrics.nodeSelector` | node labels for kube-state-metrics pod assignment | `{}`
 `kubeStateMetrics.podAnnotations` | annotations to be added to kube-state-metrics pods | `{}`
+`kubeStateMetrics.deploymentAnnotations` | annotations to be added to kube-state-metrics deployment | `{}`
 `kubeStateMetrics.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
 `kubeStateMetrics.replicaCount` | desired number of kube-state-metrics pods | `1`
 `kubeStateMetrics.resources` | kube-state-metrics resource requests and limits (YAML) | `{}`
@@ -237,6 +238,7 @@ Parameter | Description | Default
 `server.persistentVolume.storageClass` | Prometheus server data Persistent Volume Storage Class |  `unset`
 `server.persistentVolume.subPath` | Subdirectory of Prometheus server data Persistent Volume to mount | `""`
 `server.podAnnotations` | annotations 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.resources` | Prometheus server resource requests and limits | `{}`
 `server.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for server containers | `{}`
diff --git a/stable/prometheus/templates/kube-state-metrics-deployment.yaml b/stable/prometheus/templates/kube-state-metrics-deployment.yaml
index c21e46ec0c..d8715f64a2 100644
--- a/stable/prometheus/templates/kube-state-metrics-deployment.yaml
+++ b/stable/prometheus/templates/kube-state-metrics-deployment.yaml
@@ -2,6 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
+{{- if .Values.kubeStateMetrics.deploymentAnnotations }}
+  annotations:
+{{ toYaml .Values.kubeStateMetrics.deploymentAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ template "prometheus.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml
index 2f1cb122c0..b5e713009b 100644
--- a/stable/prometheus/templates/server-deployment.yaml
+++ b/stable/prometheus/templates/server-deployment.yaml
@@ -1,6 +1,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
+{{- if .Values.server.deploymentAnnotations }}
+  annotations:
+{{ toYaml .Values.server.deploymentAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ template "prometheus.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}