From ca895761948d577df1cb37243b6afaf7b077bac3 Mon Sep 17 00:00:00 2001 From: rjasper-frohraum <50623292+rjasper-frohraum@users.noreply.github.com> Date: Wed, 30 Oct 2019 17:56:53 +0100 Subject: [PATCH] [stable/wordpress] Add extra configuration parameters (#18421) * [stable/wordpress] Add extra configuration parameters This adds the following parameters: - extraEnv - extraVolumeMounts - extraVolumes Signed-off-by: Rico Jasper * [stable/wordpress] Bump chart version to 7.6.0 Signed-off-by: Rico Jasper --- stable/wordpress/Chart.yaml | 2 +- stable/wordpress/README.md | 3 +++ stable/wordpress/templates/deployment.yaml | 9 +++++++++ stable/wordpress/values-production.yaml | 23 ++++++++++++++++++++++ stable/wordpress/values.yaml | 23 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) diff --git a/stable/wordpress/Chart.yaml b/stable/wordpress/Chart.yaml index 4284212e4e..5f77cf1352 100755 --- a/stable/wordpress/Chart.yaml +++ b/stable/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 7.5.4 +version: 7.6.0 appVersion: 5.2.4 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 753158c2f8..7a9e6a181a 100644 --- a/stable/wordpress/README.md +++ b/stable/wordpress/README.md @@ -80,6 +80,9 @@ The following table lists the configurable parameters of the WordPress chart and | `smtpUsername` | User name for SMTP emails | `nil` | | `smtpProtocol` | SMTP protocol [`tls`, `ssl`, `none`] | `nil` | | `replicaCount` | Number of WordPress Pods to run | `1` | +| `extraEnv` | Additional container environment variables | `[]` | +| `extraVolumeMounts` | Additional volume mounts | `[]` | +| `extraVolumes` | Additional volumes | `[]` | | `mariadb.enabled` | Deploy MariaDB container(s) | `true` | | `mariadb.rootUser.password` | MariaDB admin password | `nil` | | `mariadb.db.name` | Database name to create | `bitnami_wordpress` | diff --git a/stable/wordpress/templates/deployment.yaml b/stable/wordpress/templates/deployment.yaml index 69a11bb765..8f52e6a3bb 100644 --- a/stable/wordpress/templates/deployment.yaml +++ b/stable/wordpress/templates/deployment.yaml @@ -131,6 +131,9 @@ spec: - name: SMTP_PROTOCOL value: {{ .Values.smtpProtocol | quote }} {{- end }} + {{- with .Values.extraEnv }} +{{ toYaml . | indent 8 }} + {{- end }} ports: - name: http containerPort: 80 @@ -169,6 +172,9 @@ spec: name: custom-htaccess subPath: wordpress-htaccess.conf {{- end }} + {{- with .Values.extraVolumeMounts }} +{{ toYaml . | indent 8 }} + {{- end }} resources: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.metrics.enabled }} @@ -210,6 +216,9 @@ spec: {{- else }} emptyDir: {} {{ end }} + {{- with .Values.extraVolumes }} +{{ toYaml . | indent 6 }} + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} diff --git a/stable/wordpress/values-production.yaml b/stable/wordpress/values-production.yaml index b649082c7c..3a0f5558c8 100644 --- a/stable/wordpress/values-production.yaml +++ b/stable/wordpress/values-production.yaml @@ -122,6 +122,29 @@ customHTAccessCM: replicaCount: 3 +# Additional container environment variables +extraEnv: [] + ## Example: Configure SSL for database + # - name: WORDPRESS_DATABASE_SSL_CA_FILE + # value: /path/to/ca_cert + +# Additional volume mounts +extraVolumeMounts: [] + ## Example: Mount CA file + # - name: ca-cert + # subPath: ca_cert + # mountPath: /path/to/ca_cert + +# Additional volumes +extraVolumes: [] + ## Example: Add secret volume + # - name: ca-cert + # secret: + # secretName: ca-cert + # items: + # - key: ca-cert + # path: ca_cert + externalDatabase: ## All of these values are only used when mariadb.enabled is set to false ## Database host diff --git a/stable/wordpress/values.yaml b/stable/wordpress/values.yaml index 3177913b9e..4e93085edf 100644 --- a/stable/wordpress/values.yaml +++ b/stable/wordpress/values.yaml @@ -122,6 +122,29 @@ customHTAccessCM: replicaCount: 1 +# Additional container environment variables +extraEnv: [] + ## Example: Configure SSL for database + # - name: WORDPRESS_DATABASE_SSL_CA_FILE + # value: /path/to/ca_cert + +# Additional volume mounts +extraVolumeMounts: [] + ## Example: Mount CA file + # - name: ca-cert + # subPath: ca_cert + # mountPath: /path/to/ca_cert + +# Additional volumes +extraVolumes: [] + ## Example: Add secret volume + # - name: ca-cert + # secret: + # secretName: ca-cert + # items: + # - key: ca-cert + # path: ca_cert + externalDatabase: ## All of these values are only used when mariadb.enabled is set to false ## Database host