From 3b934d8366f797a6d6ebff5287ba5fdc42a76e62 Mon Sep 17 00:00:00 2001 From: satchpx <42478164+satchpx@users.noreply.github.com> Date: Fri, 31 May 2019 01:14:25 -0700 Subject: [PATCH] updates to support alternate k8s scheduler (#14363) Signed-off-by: Sathya Balakrishnan --- stable/postgresql/Chart.yaml | 2 +- stable/postgresql/README.md | 1 + stable/postgresql/templates/statefulset-slaves.yaml | 3 +++ stable/postgresql/templates/statefulset.yaml | 3 +++ stable/postgresql/values-production.yaml | 5 +++++ stable/postgresql/values.yaml | 5 +++++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml index ae19429ab0..fab5769d24 100644 --- a/stable/postgresql/Chart.yaml +++ b/stable/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 5.1.2 +version: 5.2.0 appVersion: 11.3.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/stable/postgresql/README.md b/stable/postgresql/README.md index 6782fbdb93..7d2ead4a01 100644 --- a/stable/postgresql/README.md +++ b/stable/postgresql/README.md @@ -94,6 +94,7 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `service.annotations` | Annotations for PostgreSQL service | {} | | `service.loadBalancerIP` | loadBalancerIP if service type is `LoadBalancer` | `nil` | | `service.loadBalancerSourceRanges` | Address that are allowed when svc is LoadBalancer | [] | +| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.existingClaim` | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template. | `nil` | | `persistence.mountPath` | Path to mount the volume at | `/bitnami/postgresql` | diff --git a/stable/postgresql/templates/statefulset-slaves.yaml b/stable/postgresql/templates/statefulset-slaves.yaml index 2b035d176f..8ea71214d7 100644 --- a/stable/postgresql/templates/statefulset-slaves.yaml +++ b/stable/postgresql/templates/statefulset-slaves.yaml @@ -33,6 +33,9 @@ spec: {{ toYaml . | indent 8 }} {{- end }} spec: + {{- if .Values.schedulerName }} + schedulerName: "{{ .Values.schedulerName }}" + {{- end }} {{- include "postgresql.imagePullSecrets" . | indent 6 }} {{- if .Values.slave.nodeSelector }} nodeSelector: diff --git a/stable/postgresql/templates/statefulset.yaml b/stable/postgresql/templates/statefulset.yaml index bdc0ba974f..a837c94532 100644 --- a/stable/postgresql/templates/statefulset.yaml +++ b/stable/postgresql/templates/statefulset.yaml @@ -37,6 +37,9 @@ spec: {{ toYaml . | indent 8 }} {{- end }} spec: + {{- if .Values.schedulerName }} + schedulerName: "{{ .Values.schedulerName }}" + {{- end }} {{- include "postgresql.imagePullSecrets" . | indent 6 }} {{- if .Values.master.nodeSelector }} nodeSelector: diff --git a/stable/postgresql/values-production.yaml b/stable/postgresql/values-production.yaml index 6e9e3e8f7c..09aed4b543 100644 --- a/stable/postgresql/values-production.yaml +++ b/stable/postgresql/values-production.yaml @@ -57,6 +57,11 @@ volumePermissions: securityContext: runAsUser: 0 +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/stable/postgresql/values.yaml b/stable/postgresql/values.yaml index a549279ad2..9e26f5d0bd 100644 --- a/stable/postgresql/values.yaml +++ b/stable/postgresql/values.yaml @@ -57,6 +57,11 @@ volumePermissions: securityContext: runAsUser: 0 +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ##