From a0ccf2b9ca7d1cbbc7ff7f2680b24166696ed812 Mon Sep 17 00:00:00 2001 From: satchpx <42478164+satchpx@users.noreply.github.com> Date: Fri, 31 May 2019 01:30:30 -0700 Subject: [PATCH] updates to support alternate k8s scheduler (#14366) Signed-off-by: Sathya Balakrishnan --- stable/rabbitmq/Chart.yaml | 2 +- stable/rabbitmq/README.md | 1 + stable/rabbitmq/templates/statefulset.yaml | 3 +++ stable/rabbitmq/values-production.yaml | 5 +++++ stable/rabbitmq/values.yaml | 5 +++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml index 6a76d5c0bf..180d8c4d6b 100644 --- a/stable/rabbitmq/Chart.yaml +++ b/stable/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 5.8.2 +version: 5.9.0 appVersion: 3.7.15 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md index 4abe48328f..852f472eba 100644 --- a/stable/rabbitmq/README.md +++ b/stable/rabbitmq/README.md @@ -80,6 +80,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `service.managerPort` | RabbitMQ Manager port | `15672` | | `persistence.enabled` | Use a PVC to persist data | `true` | | `service.annotations` | service annotations as an array | [] | +| `schedulerName` | Name of the k8s service (other than default) | `nil` | | `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | | `persistence.existingClaim` | RabbitMQ data Persistent Volume existing claim name, evaluated as a template | "" | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | diff --git a/stable/rabbitmq/templates/statefulset.yaml b/stable/rabbitmq/templates/statefulset.yaml index 8818738786..9408b7cff3 100644 --- a/stable/rabbitmq/templates/statefulset.yaml +++ b/stable/rabbitmq/templates/statefulset.yaml @@ -34,6 +34,9 @@ spec: {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} spec: + {{- if .Values.schedulerName }} + schedulerName: "{{ .Values.schedulerName }}" + {{- end }} {{- include "rabbitmq.imagePullSecrets" . | indent 6 }} {{- if .Values.rbacEnabled}} serviceAccountName: {{ template "rabbitmq.fullname" . }} diff --git a/stable/rabbitmq/values-production.yaml b/stable/rabbitmq/values-production.yaml index becb1a8a94..4306b89d37 100644 --- a/stable/rabbitmq/values-production.yaml +++ b/stable/rabbitmq/values-production.yaml @@ -32,6 +32,11 @@ image: # pullSecrets: # - myRegistryKeySecretName +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## does your cluster have rbac enabled? assume yes by default rbacEnabled: true diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml index a901e8e74e..fd250236c9 100644 --- a/stable/rabbitmq/values.yaml +++ b/stable/rabbitmq/values.yaml @@ -32,6 +32,11 @@ image: # pullSecrets: # - myRegistryKeySecretName +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## does your cluster have rbac enabled? assume yes by default rbacEnabled: true