updates to support an alternate k8s scheduler (#14356)

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>
This commit is contained in:
satchpx
2019-05-31 08:48:27 -07:00
committed by Kubernetes Prow Robot
parent 2768d8d4a2
commit e043fc0cf5
5 changed files with 13 additions and 1 deletions
+1 -1
View File
@@ -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.
+1
View File
@@ -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 | `{}` |
@@ -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 }}"
@@ -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 }}"
+5
View File
@@ -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"