From 67ed74b614bb5f4e068017101a8673c63459f383 Mon Sep 17 00:00:00 2001
From: Laurent Godet <1172558+lostick@users.noreply.github.com>
Date: Mon, 21 Oct 2019 14:07:38 +0100
Subject: [PATCH] Add initContainers support for prometheus server (#17218)

Signed-off-by: Laurent Godet <mevoyasf@gmail.com>
---
 stable/prometheus/Chart.yaml                       | 4 ++--
 stable/prometheus/README.md                        | 3 ++-
 stable/prometheus/templates/server-deployment.yaml | 4 ++++
 stable/prometheus/values.yaml                      | 6 +++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index f92445ad42..f41c4c5450 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: prometheus
-version: 9.1.3
-appVersion: 2.11.1
+version: 9.2.0
+appVersion: 2.13.1
 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 617514c725..2d181270f5 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -246,7 +246,7 @@ Parameter | Description | Default
 `server.enabled` | If false, Prometheus server will not be created | `true`
 `server.name` | Prometheus server container name | `server`
 `server.image.repository` | Prometheus server container image repository | `prom/prometheus`
-`server.image.tag` | Prometheus server container image tag | `v2.11.1`
+`server.image.tag` | Prometheus server container image tag | `v2.13.1`
 `server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
 `server.enableAdminApi` |  If true, Prometheus administrative HTTP API will be enabled. Please note, that you should take care of administrative API access protection (ingress or some frontend Nginx with auth) before enabling it. | `false`
 `server.skipTSDBLock` |  If true, Prometheus skip TSDB locking. | `false`
@@ -255,6 +255,7 @@ Parameter | Description | Default
 `server.global.scrape_timeout` | How long until a scrape request times out | `10s`
 `server.global.evaluation_interval` | How frequently to evaluate rules | `1m`
 `server.extraArgs` | Additional Prometheus server container arguments | `{}`
+`server.extraInitContainers` | Init containers to launch alongside the server | `[]`
 `server.prefixURL` | The prefix slug at which the server can be accessed | ``
 `server.baseURL` | The external url at which the server can be accessed | ``
 `server.env` | Prometheus server environment variables | `[]`
diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml
index fb4ade2c66..83538135ad 100644
--- a/stable/prometheus/templates/server-deployment.yaml
+++ b/stable/prometheus/templates/server-deployment.yaml
@@ -38,6 +38,10 @@ spec:
       schedulerName: "{{ .Values.server.schedulerName }}"
 {{- end }}
       serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
+      {{- if .Values.server.extraInitContainers }}
+      initContainers:
+{{ toYaml .Values.server.extraInitContainers | indent 8 }}
+      {{- end }}
       containers:
         - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }}
           image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index bbaaed2498..a380b792c4 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -543,7 +543,7 @@ server:
   ##
   image:
     repository: prom/prometheus
-    tag: v2.11.1
+    tag: v2.13.1
     pullPolicy: IfNotPresent
 
   ## prometheus server priorityClassName
@@ -601,6 +601,10 @@ server:
   ##
   extraArgs: {}
 
+  ## Additional InitContainers to initialize the pod
+  ##
+  extraInitContainers: []
+
   ## Additional Prometheus server Volume mounts
   ##
   extraVolumeMounts: []