From ab751570beadb0954356ece2a3fc1ac78a5263dc Mon Sep 17 00:00:00 2001
From: Corey O'Brien <corey@fairwinds.com>
Date: Thu, 25 Jul 2019 20:13:57 -0400
Subject: [PATCH] [stable/kube-state-metrics] Add option for service
 annotations (#15864)

Signed-off-by: Corey O'Brien <corey@fairwinds.com>
---
 stable/kube-state-metrics/Chart.yaml             | 2 +-
 stable/kube-state-metrics/README.md              | 1 +
 stable/kube-state-metrics/templates/service.yaml | 7 +++++--
 stable/kube-state-metrics/values.yaml            | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
index 3fcecd6a2f..e918432f3f 100644
--- a/stable/kube-state-metrics/Chart.yaml
+++ b/stable/kube-state-metrics/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - monitoring
 - prometheus
 - kubernetes
-version: 2.1.1
+version: 2.2.1
 appVersion: 1.7.1
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
diff --git a/stable/kube-state-metrics/README.md b/stable/kube-state-metrics/README.md
index 975be8f19a..78ddeaac90 100644
--- a/stable/kube-state-metrics/README.md
+++ b/stable/kube-state-metrics/README.md
@@ -19,6 +19,7 @@ $ helm install stable/kube-state-metrics
 | `image.pullPolicy`                      | Image pull policy                                                                     | `IfNotPresent`                             |
 | `replicas`                              | Number of replicas                                                                    | `1`                                        |
 | `service.port`                          | The port of the container                                                             | `8080`                                     |
+| `service.annotations`                   | Annotations to be added to the service                                                | `{}`
 | `customLabels`                          | Custom labels to apply to service, deployment and pods                                | `{}`                                       |
 | `hostNetwork`                           | Whether or not to use the host network                                                | `false`                                    |
 | `prometheusScrape`                      | Whether or not enable prom scrape                                                     | `true`                                     |
diff --git a/stable/kube-state-metrics/templates/service.yaml b/stable/kube-state-metrics/templates/service.yaml
index dc05380889..a880bf912e 100644
--- a/stable/kube-state-metrics/templates/service.yaml
+++ b/stable/kube-state-metrics/templates/service.yaml
@@ -10,10 +10,13 @@ metadata:
 {{- if .Values.customLabels }}
 {{ toYaml .Values.customLabels | indent 4 }}
 {{- end }}
-  {{- if .Values.prometheusScrape }}
   annotations:
+    {{- if .Values.prometheusScrape }}
     prometheus.io/scrape: '{{ .Values.prometheusScrape }}'
-  {{- end }}
+    {{- end }}
+    {{- if .Values.service.annotations }}
+    {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- end }}
 spec:
   type: "{{ .Values.service.type }}"
   ports:
diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
index 6c099f6f42..a08b8f1fae 100644
--- a/stable/kube-state-metrics/values.yaml
+++ b/stable/kube-state-metrics/values.yaml
@@ -13,6 +13,7 @@ service:
   type: ClusterIP
   nodePort: 0
   loadBalancerIP: ""
+  annotations: {}
 
 customLabels: {}