From dd52fa5ace2fef0291fe1386317727019f2f47c0 Mon Sep 17 00:00:00 2001
From: Terje Sannum <terje@offpiste.org>
Date: Wed, 10 Jan 2018 07:01:12 +0100
Subject: [PATCH] [stable/prometheus] Add support for kube-state-metrics
 container arguments (#2368)

* add support for specifying args to kube-state-metrics

* Update Chart.yaml
---
 stable/prometheus/Chart.yaml                                | 2 +-
 stable/prometheus/README.md                                 | 1 +
 .../prometheus/templates/kube-state-metrics-deployment.yaml | 6 ++++++
 stable/prometheus/values.yaml                               | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index ef3f8c25cf..b6ff58b1ee 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 4.6.16
+version: 4.6.17
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md
index 6e19e5cca0..4063605fe8 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -88,6 +88,7 @@ Parameter | Description | Default
 `kubeStateMetrics.image.repository` | kube-state-metrics container image repository| `k8s.gcr.io/kube-state-metrics`
 `kubeStateMetrics.image.tag` | kube-state-metrics container image tag | `v0.4.1`
 `kubeStateMetrics.image.pullPolicy` | kube-state-metrics container image pull policy | `IfNotPresent`
+`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.replicaCount` | desired number of kube-state-metrics pods | `1`
diff --git a/stable/prometheus/templates/kube-state-metrics-deployment.yaml b/stable/prometheus/templates/kube-state-metrics-deployment.yaml
index 63fae7a564..7ffdf1564e 100644
--- a/stable/prometheus/templates/kube-state-metrics-deployment.yaml
+++ b/stable/prometheus/templates/kube-state-metrics-deployment.yaml
@@ -27,6 +27,12 @@ spec:
         - name: {{ template "prometheus.name" . }}-{{ .Values.kubeStateMetrics.name }}
           image: "{{ .Values.kubeStateMetrics.image.repository }}:{{ .Values.kubeStateMetrics.image.tag }}"
           imagePullPolicy: "{{ .Values.kubeStateMetrics.image.pullPolicy }}"
+        {{- if .Values.kubeStateMetrics.args }}
+          args:
+          {{- range $key, $value := .Values.kubeStateMetrics.args }}
+            - --{{ $key }}={{ $value }}
+          {{- end }}
+        {{- end }}
           ports:
             - name: metrics
               containerPort: 8080
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index 54734baecc..ec023fa961 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -194,6 +194,10 @@ kubeStateMetrics:
     tag: v1.1.0-rc.0
     pullPolicy: IfNotPresent
 
+  ## kube-state-metrics container arguments
+  ##
+  args: {}
+
   ## Node labels for kube-state-metrics pod assignment
   ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
   ##