From ad5b27593ddaa0815c7779a80255177bafcb232a Mon Sep 17 00:00:00 2001
From: Brinn Joyce <brinn.joyce@gmail.com>
Date: Tue, 3 Sep 2024 21:34:51 +1200
Subject: [PATCH] Revert to walStorage disabled by default and add enabled flag
 to enable (#367)

* Revert to walStorage disabled by default and add enabled flag to enable it

Signed-off-by: Brinn Joyce <brinn.joyce@gmail.com>
---
 charts/cluster/templates/cluster.yaml                          | 2 +-
 .../01-non_default_configuration_cluster.yaml                  | 1 +
 charts/cluster/values.schema.json                              | 3 +++
 charts/cluster/values.yaml                                     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
index 2dace8e34..68b6664f4 100644
--- a/charts/cluster/templates/cluster.yaml
+++ b/charts/cluster/templates/cluster.yaml
@@ -24,7 +24,7 @@ spec:
   storage:
     size: {{ .Values.cluster.storage.size }}
     storageClass: {{ .Values.cluster.storage.storageClass }}
-{{- if .Values.cluster.walStorage }}
+{{- if .Values.cluster.walStorage.enabled }}
   walStorage:
     size: {{ .Values.cluster.walStorage.size }}
     storageClass: {{ .Values.cluster.walStorage.storageClass }}
diff --git a/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml b/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
index a68ef8df2..07a96e617 100644
--- a/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
+++ b/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
@@ -9,6 +9,7 @@ cluster:
     size: 256Mi
     storageClass: standard
   walStorage:
+    enabled: true
     size: 256Mi
     storageClass: standard
   postgresUID: 1001
diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
index 1ef5bba79..e5a81ba4c 100644
--- a/charts/cluster/values.schema.json
+++ b/charts/cluster/values.schema.json
@@ -276,6 +276,9 @@
                 "walStorage": {
                     "type": "object",
                     "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        },
                         "size": {
                             "type": "string"
                         },
diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
index 0ee58d7da..c5a5b1d22 100644
--- a/charts/cluster/values.yaml
+++ b/charts/cluster/values.yaml
@@ -136,6 +136,7 @@ cluster:
     storageClass: ""
 
   walStorage:
+    enabled: false
     size: 1Gi
     storageClass: ""