From e043fc0cf52084b5a790aa2433c1d02c7f617f7c Mon Sep 17 00:00:00 2001
From: satchpx <42478164+satchpx@users.noreply.github.com>
Date: Fri, 31 May 2019 08:48:27 -0700
Subject: [PATCH] updates to support an alternate k8s scheduler (#14356)

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>
---
 stable/elasticsearch/Chart.yaml                        | 2 +-
 stable/elasticsearch/README.md                         | 1 +
 stable/elasticsearch/templates/data-statefulset.yaml   | 3 +++
 stable/elasticsearch/templates/master-statefulset.yaml | 3 +++
 stable/elasticsearch/values.yaml                       | 5 +++++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/stable/elasticsearch/Chart.yaml b/stable/elasticsearch/Chart.yaml
index ecba3354fc..fb623a5e98 100755
--- a/stable/elasticsearch/Chart.yaml
+++ b/stable/elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: elasticsearch
 home: https://www.elastic.co/products/elasticsearch
-version: 1.27.3
+version: 1.28.0
 appVersion: 6.7.0
 description: Flexible and powerful open source, distributed real-time search and analytics
   engine.
diff --git a/stable/elasticsearch/README.md b/stable/elasticsearch/README.md
index 3d2a6478f9..a1cd84ea3a 100644
--- a/stable/elasticsearch/README.md
+++ b/stable/elasticsearch/README.md
@@ -68,6 +68,7 @@ The following table lists the configurable parameters of the elasticsearch chart
 | `initImage.repository`               | Init container image name                                           | `busybox`                                           |
 | `initImage.tag`                      | Init container image tag                                            | `latest`                                            |
 | `initImage.pullPolicy`               | Init container pull policy                                          | `Always`                                            |
+| `schedulerName`                      | Name of the k8s scheduler (other than default)                      | `nil`                                               |
 | `cluster.name`                       | Cluster name                                                        | `elasticsearch`                                     |
 | `cluster.xpackEnable`                | Writes the X-Pack configuration options to the configuration file   | `false`                                             |
 | `cluster.config`                     | Additional cluster config appended                                  | `{}`                                                |
diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
index b241da4196..02572aeb98 100644
--- a/stable/elasticsearch/templates/data-statefulset.yaml
+++ b/stable/elasticsearch/templates/data-statefulset.yaml
@@ -23,6 +23,9 @@ spec:
 {{ toYaml .Values.data.podAnnotations | indent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
       serviceAccountName: {{ template "elasticsearch.serviceAccountName.data" . }}
 {{- if .Values.data.priorityClassName }}
       priorityClassName: "{{ .Values.data.priorityClassName }}"
diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml
index 056ca3d5c7..c519a5d478 100644
--- a/stable/elasticsearch/templates/master-statefulset.yaml
+++ b/stable/elasticsearch/templates/master-statefulset.yaml
@@ -23,6 +23,9 @@ spec:
 {{ toYaml .Values.master.podAnnotations | indent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
       serviceAccountName: {{ template "elasticsearch.serviceAccountName.master" . }}
 {{- if .Values.master.priorityClassName }}
       priorityClassName: "{{ .Values.master.priorityClassName }}"
diff --git a/stable/elasticsearch/values.yaml b/stable/elasticsearch/values.yaml
index 7d72e723e2..89471f54c2 100644
--- a/stable/elasticsearch/values.yaml
+++ b/stable/elasticsearch/values.yaml
@@ -35,6 +35,11 @@ securityContext:
   enabled: false
   runAsUser: 1000
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName: "default-scheduler"
+
 image:
   repository: "docker.elastic.co/elasticsearch/elasticsearch-oss"
   tag: "6.7.0"