From 715f8f7730c39030d104b9d57faaef8ad66af10c Mon Sep 17 00:00:00 2001
From: groundhog2k <10630407+groundhog2k@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:55:26 +0100
Subject: [PATCH] Added php memory limit configuration to wordpress chart (#67)

---
 charts/wordpress/Chart.yaml                     | 2 +-
 charts/wordpress/README.md                      | 3 ++-
 charts/wordpress/templates/extended-config.yaml | 1 +
 charts/wordpress/values.yaml                    | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index 285829f7..f6080885 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 type: application
 
 # This is the chart version.
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed.
 appVersion: "5.5.1-apache"
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index 433db4ac..cc50ddd5 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
 #  Wordpress
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.5.1-apache](https://img.shields.io/badge/AppVersion-5.5.1-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.5.1-apache](https://img.shields.io/badge/AppVersion-5.5.1-informational?style=flat-square)
 
 A Helm chart for Wordpress on Kubernetes
 
@@ -117,6 +117,7 @@ $ helm uninstall my-release
 | customPhpConfig | string | `""` | Additional PHP custom.ini |
 | settings.tablePrefix | string | `nil` | Database table name prefix |
 | settings.maxFileUploadSize | string | `64M` | Maximum file upload size |
+| settings.memoryLimit | string | `128M` | PHP memory limit |
 
 ## Storage parameters
 
diff --git a/charts/wordpress/templates/extended-config.yaml b/charts/wordpress/templates/extended-config.yaml
index c4f9343f..902de8ef 100644
--- a/charts/wordpress/templates/extended-config.yaml
+++ b/charts/wordpress/templates/extended-config.yaml
@@ -28,4 +28,5 @@ data:
     {{ .Values.customPhpConfig | nindent 4 }}
     {{- else }}
     upload_max_filesize = {{ .Values.settings.maxFileUploadSize }}
+    memory_limit = {{ .Values.settings.memoryLimit }}
     {{- end }}
diff --git a/charts/wordpress/values.yaml b/charts/wordpress/values.yaml
index b601e865..90f7e72f 100644
--- a/charts/wordpress/values.yaml
+++ b/charts/wordpress/values.yaml
@@ -131,6 +131,8 @@ settings:
   tablePrefix:
   ## Maximum file upload size (default: 64M)
   maxFileUploadSize: 64M
+  ## PHP memory limit (default: 128M)
+  memoryLimit: 128M
 
 ## Additional PHP custom.ini
 customPhpConfig: |
-- 
GitLab