From 31e8276d260e69780c76e530a2fb698fe0a0cec4 Mon Sep 17 00:00:00 2001 From: satchpx <42478164+satchpx@users.noreply.github.com> Date: Fri, 31 May 2019 01:30:42 -0700 Subject: [PATCH] [stable/wordpress] updates to support an alternate k8s scheduler (#14368) * updates to support alternate k8s scheduler Signed-off-by: Sathya Balakrishnan * update chart version Signed-off-by: Sathya Balakrishnan --- stable/wordpress/Chart.yaml | 2 +- stable/wordpress/README.md | 1 + stable/wordpress/templates/deployment.yaml | 3 +++ stable/wordpress/values-production.yaml | 5 +++++ stable/wordpress/values.yaml | 5 +++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stable/wordpress/Chart.yaml b/stable/wordpress/Chart.yaml index dd75d16def..54497d6539 100644 --- a/stable/wordpress/Chart.yaml +++ b/stable/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 5.10.0 +version: 5.11.0 appVersion: 5.2.1 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/stable/wordpress/README.md b/stable/wordpress/README.md index aa4ce7cbb1..24b221ca0d 100644 --- a/stable/wordpress/README.md +++ b/stable/wordpress/README.md @@ -105,6 +105,7 @@ The following table lists the configurable parameters of the WordPress chart and | `ingress.secrets[0].name` | TLS Secret Name | `nil` | | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` | +| `schedulerName` | Name of the alternate scheduler | `nil` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.existingClaim` | Enable persistence using an existing PVC | `nil` | | `persistence.storageClass` | PVC Storage Class | `nil` (uses alpha storage class annotation) | diff --git a/stable/wordpress/templates/deployment.yaml b/stable/wordpress/templates/deployment.yaml index 4b803d53b4..1150096b29 100644 --- a/stable/wordpress/templates/deployment.yaml +++ b/stable/wordpress/templates/deployment.yaml @@ -29,6 +29,9 @@ spec: {{- end }} {{- end }} spec: + {{- if .Values.schedulerName }} + schedulerName: "{{ .Values.schedulerName }}" + {{- end }} {{- include "wordpress.imagePullSecrets" . | indent 6 }} hostAliases: - ip: "127.0.0.1" diff --git a/stable/wordpress/values-production.yaml b/stable/wordpress/values-production.yaml index 507014327b..9f2fcffd3a 100644 --- a/stable/wordpress/values-production.yaml +++ b/stable/wordpress/values-production.yaml @@ -76,6 +76,11 @@ allowOverrideNone: true # ConfigMap with custom wordpress-htaccess.conf file (requires allowOverrideNone to true) customHTAccessCM: +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-wordpress/#smtp-configuration ## diff --git a/stable/wordpress/values.yaml b/stable/wordpress/values.yaml index 103f53e5c6..2321e3b05c 100644 --- a/stable/wordpress/values.yaml +++ b/stable/wordpress/values.yaml @@ -80,6 +80,11 @@ allowOverrideNone: false # ConfigMap with custom wordpress-htaccess.conf file (requires allowOverrideNone to true) customHTAccessCM: +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +# schedulerName: + ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-wordpress/#smtp-configuration ##