Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add walStorage capability and remove gkeEnvironment conflict in cluster chart. #312

Merged
merged 6 commits into from
Jun 15, 2024
Merged

Add walStorage capability and remove gkeEnvironment conflict in cluster chart. #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
274c40e
Add walStorage option to cluster.yaml template
rocket357 Jun 10, 2024
e9e09ca
Formatting fix
rocket357 Jun 10, 2024
4851c79
Remove applicationCredentials when gktEnvironment is true.
rocket357 Jun 12, 2024
4d20f4f
Update values.yaml
rocket357 Jun 13, 2024
5de7846
Update values.schema.json
rocket357 Jun 13, 2024
a240b84
Merge branch 'main' into main
rocket357 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/cluster/templates/_barman_object_store.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
6 changes: 5 additions & 1 deletion charts/cluster/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
11 changes: 11 additions & 0 deletions charts/cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,17 @@
}
}
},
"walStorage": {
"type": "object",
"properties": {
"size": {
"type": "string"
},
"storageClass": {
"type": "string"
}
}
},
"superuserSecret": {
"type": "string"
}
Expand Down
4 changes: 4 additions & 0 deletions charts/cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading