fix: move common cluster defaults to chart/values.yaml

charts/archmeister/chart/values.yaml

@@ -58,12 +58,23 @@ persistence:
   # size: 10G
   # storageClass: ""
   # accessMode: ReadWriteMany
+
 cluster:
   enabled: true
-  instances: 2
-  backupEnabled: true
-  backupRetention: 60d
+  instances: 1
   size: 5Gi
+  backupEnabled: false
+  backupRetention: 30d
+  imageName: ghcr.io/cloudnative-pg/postgis:15-3.3
+  bootstrap:
+    initdb:
+      postInitTemplateSQL:
+        - CREATE EXTENSION postgis;
+        - CREATE EXTENSION postgis_topology;
+        - CREATE EXTENSION fuzzystrmatch;
+        - CREATE EXTENSION postgis_tiger_geocoder;
+        - ALTER USER app WITH SUPERUSER;
+
 resources: {}
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little

charts/archmeister/values-prod.yaml

@@ -3,17 +3,9 @@ ingress:
     cert-manager.io/cluster-issuer: letsencrypt-production
 
 cluster:
-  backupEnabled: false
+  backupEnabled: true
+  backupRetention: 60d
   instances: 2
-  imageName: ghcr.io/cloudnative-pg/postgis:15-3.3
-  bootstrap:
-    initdb:
-      postInitTemplateSQL:
-        - CREATE EXTENSION postgis;
-        - CREATE EXTENSION postgis_topology;
-        - CREATE EXTENSION fuzzystrmatch;
-        - CREATE EXTENSION postgis_tiger_geocoder;
-        - ALTER USER app WITH SUPERUSER;
 
 resources:
   limits:

charts/archmeister/values-staging.yaml

@@ -6,19 +6,6 @@ ingress:
     cert-manager.io/cluster-issuer: letsencrypt-production
     atlantis.oceanbox.io/expose: global
 
-cluster:
-  backupEnabled: false
-  instances: 1
-  imageName: ghcr.io/cloudnative-pg/postgis:15-3.3
-  bootstrap:
-    initdb:
-      postInitTemplateSQL:
-        - CREATE EXTENSION postgis;
-        - CREATE EXTENSION postgis_topology;
-        - CREATE EXTENSION fuzzystrmatch;
-        - CREATE EXTENSION postgis_tiger_geocoder;
-        - ALTER USER app WITH SUPERUSER;
-
 resources:
   limits:
     cpu: 200m