Add walStorage capability and remove gkeEnvironment conflict in clust…

…er chart. (#312) * Add walStorage option to cluster.yaml template * Bug Fix: Remove applicationCredentials when gktEnvironment is true. Signed-off-by: Jon <[email protected]>
cloudnative-pg · Jun 15, 2024 · fd5eff9 · Stevenpc3 · Aug 9, 2024 · fd5eff9
1 parent 50666bd
commit fd5eff9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/charts/cluster/templates/_barman_object_store.tpl b/charts/cluster/templates/_barman_object_store.tpl
@@ -62,8 +62,10 @@
   {{- $secretName := coalesce .scope.secret.name (printf "%s-%s-google-creds" .chartFullname .secretPrefix) }}
   googleCredentials:
     gkeEnvironment: {{ .scope.google.gkeEnvironment }}
+{{- if not .scope.google.gkeEnvironment }}
     applicationCredentials:
       name: {{ $secretName }}
       key: APPLICATION_CREDENTIALS
+{{- end }}
 {{- end -}}
 {{- end -}}
diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
@@ -24,7 +24,11 @@ spec:
   storage:
     size: {{ .Values.cluster.storage.size }}
     storageClass: {{ .Values.cluster.storage.storageClass }}
-
+{{- if .Values.cluster.walStorage }}
+  walStorage:
+    size: {{ .Values.cluster.walStorage.size }}
+    storageClass: {{ .Values.cluster.walStorage.storageClass }}
+{{- end }}  
   {{- with .Values.cluster.resources }}
   resources:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -270,6 +270,17 @@
                         }
                     }
                 },
+                "walStorage": {
+                    "type": "object",
+                    "properties": {
+                        "size": {
+                            "type": "string"
+                        },
+                        "storageClass": {
+                            "type": "string"
+                        }
+                    }
+                },
                 "superuserSecret": {
                     "type": "string"
                 }

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -101,6 +101,10 @@ cluster:
   storage:
     size: 8Gi
     storageClass: ""
+
+  walStorage:
+    size: 1Gi
+    storageClass: ""
 
   # -- The UID of the postgres user inside the image, defaults to 26
   postgresUID: 26