From bc4d4dd1596ecd60b7f93cb7b8110c870caa79df Mon Sep 17 00:00:00 2001
From: gw0 <gw.2023@ena.one>
Date: Tue, 24 Jan 2023 02:20:08 +0100
Subject: [PATCH] Fix enabled flag and make RWX storageClassName consistent

---
 README.md         | 2 +-
 templates/mq.yaml | 4 ++--
 values.yaml       | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ec04621..ac9728c 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ helm install netmaker/netmaker --generate-name \ # generate a random id for the
 
 ### Recommended Settings:
 A minimal HA install of Netmaker can be run with the following command:
-`helm install netmaker/netmaker --generate-name --set baseDomain=nm.example.com --set RWXStorageClassName=nfs`
+`helm install netmaker/netmaker --generate-name --set baseDomain=nm.example.com --set mq.RWX.storageClassName=nfs`
 `
 This install has some notable exceptions:
 - Ingress **must** be manually configured post-install (need to create valid Ingress with TLS)
diff --git a/templates/mq.yaml b/templates/mq.yaml
index 120df91..6400c66 100644
--- a/templates/mq.yaml
+++ b/templates/mq.yaml
@@ -110,7 +110,7 @@ apiVersion: v1
 metadata:
   name: {{ include "netmaker.fullname" . }}-shared-data-pvc
 spec:
-  storageClassName: {{ required "A valid .Values.RWXStorageClassName entry required! Specify an available RWX storage class." .Values.RWXStorageClassName}}
+  storageClassName: {{ required "A valid .Values.mq.RWX.storageClassName entry required! Specify an available RWX storage class." .Values.mq.RWX.storageClassName}}
   accessModes:
     - ReadWriteMany
   resources:
@@ -167,4 +167,4 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ include "netmaker.fullname" . }}-mqtt
     app.kubernetes.io/name: {{ include "netmaker.fullname" . }}-mqtt
-  name: {{ include "netmaker.fullname" . }}-mqtt-wait
\ No newline at end of file
+  name: {{ include "netmaker.fullname" . }}-mqtt-wait
diff --git a/values.yaml b/values.yaml
index a9cacbc..892a38a 100644
--- a/values.yaml
+++ b/values.yaml
@@ -44,12 +44,15 @@ mq:
   singlenode: false
   storageSize: 128Mi
   password: 3yyerWGdds43yegGR
-
+  RWX:
+    storageClassName: ""
 
 dns:
   # -- whether or not to deploy coredns
   enabled: false
   storageSize: 128Mi
+  RWX:
+    storageClassName: ""
 
 setIpForwarding:
   enabled: true
@@ -112,6 +115,7 @@ wireguard:
   networkLimit: 10
 
 postgresql-ha:
+  enabled: true
   postgresql:
     # -- postgres user to generate
     username: netmaker
@@ -121,7 +125,6 @@ postgresql-ha:
     database: netmaker
     # -- postgress number of replicas to deploy
     replicaCount: 2
-    enabled: true
   persistence:
     # -- size of postgres DB
     size: 1Gi