From 82bb72cdefc1dfee480fdf9657d163d3a69848a5 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 20 Oct 2021 17:26:24 +0200
Subject: [PATCH] change values that need to be changed for wordpress 0.4.0
 compatibility

---
 flux2/apps/wordpress/wordpress-values-configmap.yaml | 12 +++++-------
 flux2/infrastructure/sources/wordpress.yaml          |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/flux2/apps/wordpress/wordpress-values-configmap.yaml b/flux2/apps/wordpress/wordpress-values-configmap.yaml
index 9ef653d43..3b8fe598d 100644
--- a/flux2/apps/wordpress/wordpress-values-configmap.yaml
+++ b/flux2/apps/wordpress/wordpress-values-configmap.yaml
@@ -41,12 +41,11 @@ data:
       role_key: openappstack_roles
 
     database:
-      db:
-        user: wordpress
+      auth:
+        username: wordpress
         password: "${wordpress_mariadb_password}"
-      rootUser:
-        password: "${wordpress_mariadb_root_password}"
-      master:
+        rootPassword: "${wordpress_mariadb_root_password}"
+      primary:
         persistence:
           ## Enable MariaDB persistence using Persistent Volume Claims.
           enabled: true
@@ -61,8 +60,7 @@ data:
           requests:
             cpu: 100m
             memory: 256Mi
-      replication:
-        enabled: false
+      architecture: "standalone"
 
     # It's advisable to set resource limits to prevent your K8s cluster from
     # crashing
diff --git a/flux2/infrastructure/sources/wordpress.yaml b/flux2/infrastructure/sources/wordpress.yaml
index e8743410c..16caf91d6 100644
--- a/flux2/infrastructure/sources/wordpress.yaml
+++ b/flux2/infrastructure/sources/wordpress.yaml
@@ -14,4 +14,4 @@ spec:
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: 0.2.2
+    tag: 0.4.0
-- 
GitLab