From 6e23b2ff718d9142ed7ee4e4dc89cba015671dbb Mon Sep 17 00:00:00 2001
From: satchpx <42478164+satchpx@users.noreply.github.com>
Date: Thu, 27 Jun 2019 17:19:22 -0700
Subject: [PATCH] [stable/prometheus] Updates to support an alternate scheduler
 (#14364)

* updates to support alternate k8s scheduler

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>

* bump up chart version

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>
---
 stable/prometheus/Chart.yaml                            | 2 +-
 stable/prometheus/README.md                             | 1 +
 stable/prometheus/templates/pushgateway-deployment.yaml | 5 ++++-
 stable/prometheus/values.yaml                           | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index 22b6525625..e0adce7d4f 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus
-version: 8.13.2
+version: 8.14.0
 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 b05cc67874..05703ff5ef 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -216,6 +216,7 @@ Parameter | Description | Default
 `pushgateway.podAnnotations` | annotations to be added to pushgateway pods | `{}`
 `pushgateway.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
 `pushgateway.replicaCount` | desired number of pushgateway pods | `1`
+`pushgateway.schedulerName` | pushgateway alternate scheduler name | `nil`
 `pushgateway.persistentVolume.enabled` | If true, Prometheus pushgateway will create a Persistent Volume Claim | `false`
 `pushgateway.persistentVolume.accessModes` | Prometheus pushgateway data Persistent Volume access modes | `[ReadWriteOnce]`
 `pushgateway.persistentVolume.annotations` | Prometheus pushgateway data Persistent Volume annotations | `{}`
diff --git a/stable/prometheus/templates/pushgateway-deployment.yaml b/stable/prometheus/templates/pushgateway-deployment.yaml
index befc4a7973..70cbd62c54 100644
--- a/stable/prometheus/templates/pushgateway-deployment.yaml
+++ b/stable/prometheus/templates/pushgateway-deployment.yaml
@@ -7,6 +7,9 @@ metadata:
   name: {{ template "prometheus.pushgateway.fullname" . }}
 spec:
   selector:
+    {{- if .Values.schedulerName }}
+    schedulerName: "{{ .Values.schedulerName }}"
+    {{- end }}
     matchLabels:
       {{- include "prometheus.pushgateway.matchLabels" . | nindent 6 }}
   replicas: {{ .Values.pushgateway.replicaCount }}
@@ -50,7 +53,7 @@ spec:
             - name: storage-volume
               mountPath: "{{ .Values.pushgateway.persistentVolume.mountPath }}"
               subPath: "{{ .Values.pushgateway.persistentVolume.subPath }}"
-          {{- end }}  
+          {{- end }}
     {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
       {{ toYaml .Values.imagePullSecrets | indent 2 }}
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index 14d7562291..f4d7e11e9d 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -796,6 +796,11 @@ pushgateway:
   ##
   enabled: true
 
+  ## Use an alternate scheduler, e.g. "stork".
+  ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+  ##
+  # schedulerName:
+
   ## pushgateway container name
   ##
   name: pushgateway