From e288a2cb20f885303b559114fa9e3b34f4727329 Mon Sep 17 00:00:00 2001
From: satchpx <42478164+satchpx@users.noreply.github.com>
Date: Thu, 27 Jun 2019 16:23:21 -0700
Subject: [PATCH] updates to support an alternate k8s scheduler (#14353)

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>
---
 incubator/solr/Chart.yaml                 | 2 +-
 incubator/solr/README.md                  | 1 +
 incubator/solr/templates/statefulset.yaml | 3 +++
 incubator/solr/values.yaml                | 5 +++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/incubator/solr/Chart.yaml b/incubator/solr/Chart.yaml
index 3fd8baea98..776a1fc47d 100644
--- a/incubator/solr/Chart.yaml
+++ b/incubator/solr/Chart.yaml
@@ -2,7 +2,7 @@
 
 apiVersion: "v1"
 name: "solr"
-version: "1.0.2"
+version: "1.1.0"
 appVersion: "7.6.0"
 description: "A helm chart to install Apache Solr: http://lucene.apache.org/solr/"
 keywords:
diff --git a/incubator/solr/README.md b/incubator/solr/README.md
index 7ef21a3c37..d4ec7cc9f9 100644
--- a/incubator/solr/README.md
+++ b/incubator/solr/README.md
@@ -44,6 +44,7 @@ The following table shows the configuration options for the Solr helm chart:
 | `updateStrategy`                              | The update strategy of the solr pods | `{}` |
 | `logLevel`                                    | The log level of the solr pods  | `INFO` |
 | `podDisruptionBudget`                         | The pod disruption budget for the Solr statefulset | `{"maxUnavailable": 1}`                                                                   |
+| `schedulerName`                               | The name of the k8s scheduler (other than default)  | ` nil`       |
 | `volumeClaimTemplates.storageClassName`       | The name of the storage class for the Solr PVC | ``                                                             |
 | `volumeClaimTemplates.storageSize`            | The size of the PVC | `20Gi`                                                                |
 | `volumeClaimTemplates.accessModes`            | The access mode of the PVC| `[ "ReadWriteOnce" ]`                                                       |
diff --git a/incubator/solr/templates/statefulset.yaml b/incubator/solr/templates/statefulset.yaml
index 8ffc317097..8e6ed4d5dd 100644
--- a/incubator/solr/templates/statefulset.yaml
+++ b/incubator/solr/templates/statefulset.yaml
@@ -26,6 +26,9 @@ spec:
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
     spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
       securityContext:
         fsGroup: 8983
         runAsUser: 8983
diff --git a/incubator/solr/values.yaml b/incubator/solr/values.yaml
index 214152ba83..0c9da18121 100644
--- a/incubator/solr/values.yaml
+++ b/incubator/solr/values.yaml
@@ -52,6 +52,11 @@ logLevel: "INFO"
 podDisruptionBudget:
   maxUnavailable: 1
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
 # Configuration for the solr PVC
 volumeClaimTemplates:
   storageClassName: ""