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

Fix ArgoCD diff on postgresql keys #441

Merged
merged 11 commits into from
Dec 17, 2024
+23 −7
Merged

Fix ArgoCD diff on postgresql keys #441

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0e70266
Fix ArgoCD diff on postgresql keys
Nov 8, 2024
26b3c44
Add condition to add shared_preload_libraries
Nov 8, 2024
40a76d3
Wrap postInitApplicationSQL in a if to prevent generating empty keys
Nov 8, 2024
e82d332
Wrap managed in a if to prevent generating empty keys
Nov 8, 2024
b1d7301
Wrap priorityClassName in a if to prevent generating empty keys
Nov 8, 2024
d08bd5a
Wrap storage.storageClass and walStorage.storageClass in if condition
Nov 8, 2024
2fbee9f
Merge branch 'main' into argocd_diff
bozorgmehr96 Nov 8, 2024
b925eda
Merge branch 'main' into argocd_diff
itay-grudev Dec 7, 2024
a54fd98
Merge branch 'main' into argocd_diff
itay-grudev Dec 7, 2024
4b05aab
Merge branch 'main' into argocd_diff
itay-grudev Dec 17, 2024
b973426
Merge branch 'main' into argocd_diff
itay-grudev Dec 17, 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/_bootstrap.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ bootstrap:
{{- if .Values.cluster.initdb.owner }}
owner: {{ tpl .Values.cluster.initdb.owner . }}
{{- end }}
{{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (not (empty .Values.cluster.initdb.postInitApplicationSQL)) }}
postInitApplicationSQL:
{{- if eq .Values.type "postgis" }}
- CREATE EXTENSION IF NOT EXISTS postgis;
Expand All @@ -24,6 +25,7 @@ bootstrap:
{{- printf "- %s" . | nindent 6 }}
{{- end -}}
{{- end -}}
{{- end }}
{{- else if eq .Values.mode "recovery" -}}
bootstrap:
{{- if eq .Values.recovery.method "pg_basebackup" }}
Expand Down
24 changes: 19 additions & 5 deletions charts/cluster/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ spec:
postgresGID: {{ include "cluster.postgresGID" . }}
storage:
size: {{ .Values.cluster.storage.size }}
{{- if not (empty .Values.cluster.storage.storageClass) }}
storageClass: {{ .Values.cluster.storage.storageClass }}
{{- end }}
{{- if .Values.cluster.walStorage.enabled }}
walStorage:
size: {{ .Values.cluster.walStorage.size }}
{{- if not (empty .Values.cluster.walStorage.storageClass) }}
storageClass: {{ .Values.cluster.walStorage.storageClass }}
{{- end }}
{{- end }}
{{- with .Values.cluster.resources }}
resources:
Expand All @@ -37,7 +41,9 @@ spec:
affinity:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.cluster.priorityClassName }}
priorityClassName: {{ .Values.cluster.priorityClassName }}
{{- end }}

primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}
Expand All @@ -52,27 +58,35 @@ spec:
name: {{ . }}
{{ end }}
postgresql:
{{- if or (eq .Values.type "timescaledb") (not (empty .Values.cluster.postgresql.shared_preload_libraries)) }}
shared_preload_libraries:
{{- if eq .Values.type "timescaledb" }}
- timescaledb
{{- end }}
{{- with .Values.cluster.postgresql.shared_preload_libraries }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.cluster.postgresql }}
{{- end }}
{{- with .Values.cluster.postgresql.pg_hba }}
pg_hba:
{{- toYaml .pg_hba | nindent 6 }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.cluster.postgresql.pg_ident }}
pg_ident:
{{- toYaml .pg_ident | nindent 6 }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.cluster.postgresql.parameters }}
parameters:
{{- toYaml .parameters | nindent 6 }}
{{ end }}
{{- toYaml . | nindent 6 }}
{{- end }}

{{- if not (empty .Values.cluster.roles) }}
managed:
{{- with .Values.cluster.roles }}
roles:
{{- toYaml . | nindent 6 }}
{{ end }}
{{- end }}

{{- with .Values.cluster.serviceAccountTemplate }}
serviceAccountTemplate:
Expand Down
Loading