Skip to content

Commit 80dff48

Browse files
PowerStateFailureJonathan S. Katz
authored andcommitted
chart: turn pgo.yaml into template; store storage config in values.yaml
1 parent 84bd703 commit 80dff48

File tree

4 files changed

+76
-97
lines changed

4 files changed

+76
-97
lines changed

chart/postgres-operator/files/postgres-operator/pgo.yaml

Lines changed: 0 additions & 95 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{{- define "postgres-operator.config" -}}
2+
Cluster:
3+
PrimaryNodeLabel:
4+
ReplicaNodeLabel:
5+
CCPImagePrefix: {{ .Values.env.ccp_image_prefix }}
6+
Metrics: false
7+
Badger: false
8+
CCPImageTag: {{ .Values.env.ccp_image_tag }}
9+
Port: 5432
10+
User: testuser
11+
Database: userdb
12+
PasswordAgeDays: 60
13+
PasswordLength: 8
14+
Strategy: 1
15+
Replicas: 0
16+
ArchiveMode: false
17+
ArchiveTimeout: 60
18+
ServiceType: ClusterIP
19+
Backrest: false
20+
BackrestPort: 2022
21+
Autofail: false
22+
AutofailReplaceReplica: false
23+
LogStatement: none
24+
LogMinDurationStatement: 60000
25+
PrimaryStorage: {{ .Values.pgo.PrimaryStorage }}
26+
XlogStorage: {{ .Values.pgo.XlogStorage }}
27+
BackupStorage: {{ .Values.pgo.BackupStorage }}
28+
ReplicaStorage: {{ .Values.pgo.ReplicaStorage }}
29+
BackrestStorage: {{ .Values.pgo.BackrestStorage }}
30+
Storage:
31+
{{ toYaml .Values.pgo.Storage | indent 2 }}
32+
DefaultContainerResources:
33+
DefaultLoadResources:
34+
DefaultLspvcResources:
35+
DefaultRmdataResources:
36+
DefaultBackupResources:
37+
DefaultPgbouncerResources:
38+
DefaultPgpoolResources:
39+
ContainerResources:
40+
small:
41+
RequestsMemory: 512Mi
42+
RequestsCPU: 0.1
43+
LimitsMemory: 512Mi
44+
LimitsCPU: 0.1
45+
large:
46+
RequestsMemory: 2Gi
47+
RequestsCPU: 2.0
48+
LimitsMemory: 2Gi
49+
LimitsCPU: 4.0
50+
Pgo:
51+
AutofailSleepSeconds: 9
52+
PreferredFailoverNode:
53+
Audit: false
54+
LSPVCTemplate: /pgo-config/pgo.lspvc-template.json
55+
LoadTemplate: /pgo-config/pgo.load-template.json
56+
COImagePrefix: {{ .Values.env.co_image_prefix }}
57+
COImageTag: {{ .Values.env.co_image_tag }}
58+
{{- end -}}

chart/postgres-operator/templates/configmap.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ metadata:
88
release: {{ .Release.Name }}
99
heritage: {{ .Release.Service }}
1010
data:
11+
pgo.yaml: {{ include "postgres-operator.config" . | quote }}
1112
{{ (.Files.Glob "files/postgres-operator/*").AsConfig | indent 2 }}
12-
{{ (.Files.Glob "files/postgres-operator/cluster/1/*").AsConfig | indent 2 }}
13+
{{ (.Files.Glob "files/postgres-operator/cluster/1/*").AsConfig | indent 2 }}

chart/postgres-operator/values.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ replicaCount: 1
55

66
image:
77
repository: crunchydata/postgres-operator
8-
tag: centos7-3.5.5
98
pullPolicy: IfNotPresent
109

1110
env:
@@ -16,6 +15,22 @@ env:
1615
co_image_tag: "centos7-3.5.5"
1716
tls_no_verify: false
1817

18+
pgo:
19+
PrimaryStorage: hostpathstorage
20+
XlogStorage: hostpathstorage
21+
BackupStorage: hostpathstorage
22+
ReplicaStorage: hostpathstorage
23+
BackrestStorage: backreststorage
24+
Storage:
25+
hostpathstorage:
26+
AccessMode: ReadWriteOnce
27+
Size: 1G
28+
StorageType: create
29+
backreststorage:
30+
AccessMode: ReadWriteOnce
31+
Size: 1G
32+
StorageType: create
33+
1934
service:
2035
type: ClusterIP
2136
port: 8443

0 commit comments

Comments
 (0)