Skip to content

Commit ff19d5e

Browse files
author
jmccormick2001
committed
Merge branch 'PowerStateFailure-670/repair-helm-chart-3.5' into develop-3.5
2 parents ae60353 + 5e88c74 commit ff19d5e

File tree

13 files changed

+207
-17
lines changed

13 files changed

+207
-17
lines changed

‎chart/postgres-operator/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
description: CrunchyData Postgres Operator Helm chart
33
name: postgres-operator
4-
version: 0.3.0
4+
version: 0.3.1
55
appVersion: 3.5.5
66
keywords:
77
- postgres

‎chart/postgres-operator/files/apiserver/pgorole‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pgoadmin: CreateDump, RestoreDump, ScaleCluster, CreateSchedule, DeleteSchedule, ShowSchedule, DeletePgbouncer, CreatePgbouncer, DeletePgpool, CreatePgpool, Restore, ShowSecrets, Reload, ShowConfig, Status, DfCluster, DeleteCluster, ShowCluster, CreateCluster, TestCluster, ShowBackup, DeleteBackup, CreateBackup, Label, Load, CreatePolicy, DeletePolicy, ShowPolicy, ApplyPolicy, ShowWorkflow, ShowPVC, CreateUpgrade, ShowUpgrade, DeleteUpgrade, CreateUser, DeleteUser, User, Version, CreateFailover, UpdateCluster
2-
pgoreader: Status, ShowConfig, DfCluster, ShowCluster, TestCluster, ShowBackup, ShowPolicy, ShowWorkflow, ShowPVC, ShowUpgrade, Version, ShowSchedule
1+
pgoadmin: CreateDump, RestoreDump, ScaleCluster, CreateSchedule, DeleteSchedule, ShowSchedule, DeletePgbouncer, CreatePgbouncer, DeletePgpool, CreatePgpool, Restore, ShowSecrets, Reload, ShowConfig, Status, DfCluster, DeleteCluster, ShowCluster, CreateCluster, TestCluster, ShowBackup, DeleteBackup, CreateBackup, Label, Load, CreatePolicy, DeletePolicy, ShowPolicy, ApplyPolicy, ShowWorkflow, ShowPVC, CreateUpgrade, ShowUpgrade, DeleteUpgrade, CreateUser, DeleteUser, User, Version, CreateFailover, UpdateCluster, CreateBenchmark, ShowBenchmark, DeleteBenchmark
2+
pgoreader: Status, ShowConfig, DfCluster, ShowCluster, TestCluster, ShowBackup, ShowPolicy, ShowWorkflow, ShowPVC, ShowUpgrade, Version, ShowSchedule, ShowBenchmark

‎chart/postgres-operator/files/postgres-operator/backrest-job.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"labels": {
77
"vendor": "crunchydata",
88
"pgo-backrest": "true",
9+
"pgo-backrest-job": "true",
910
"pg-cluster": "{{.ClusterName}}"
1011
}
1112
},
@@ -17,6 +18,7 @@
1718
"labels": {
1819
"vendor": "crunchydata",
1920
"pgo-backrest": "true",
21+
"pgo-backrest-job": "true",
2022
"pg-cluster": "{{.ClusterName}}"
2123
}
2224
},

‎chart/postgres-operator/files/postgres-operator/cluster/1/cluster-deployment-1.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"value": "{{.DataPathOverride}}"
7070
}, {
7171
{{.PgmonitorEnvVars}}
72+
{{.PgbouncerEnvVars}}
7273
{{.PgbackrestEnvVars}}
7374
"name": "PG_DATABASE",
7475
"value": "{{.Database}}"

‎chart/postgres-operator/files/postgres-operator/cluster/1/pgbouncer-template.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"name": "{{.Name}}",
66
"labels": {
77
"name": "{{.Name}}",
8+
"crunchy-pgbouncer": "true",
89
"pg-cluster": "{{.ClusterName}}",
910
"service-name": "{{.Name}}"
1011
}
@@ -42,6 +43,9 @@
4243
}, {
4344
"name": "PG_REPLICA_SERVICE_NAME",
4445
"value": "{{.ReplicaServiceName}}"
46+
},{
47+
"name": "PGBOUNCER_PASSWORD",
48+
"value": "{{.PgBouncerPass}}"
4549
}],
4650
"volumeMounts": [{
4751
"name": "pgbouncer-conf",

‎chart/postgres-operator/files/postgres-operator/cluster/1/pgpool-template.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"labels": {
77
"name": "{{.Name}}",
88
"pg-cluster": "{{.ClusterName}}",
9+
"crunchy-pgpool": "true",
910
"service-name": "{{.Name}}"
1011
}
1112
},

‎chart/postgres-operator/files/postgres-operator/pgbench-job.json‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"apiVersion": "batch/v1",
3+
"kind": "Job",
4+
"metadata": {
5+
"name": "{{.JobName}}",
6+
"labels": {
7+
"name": "{{.JobName}}",
8+
"vendor": "crunchydata",
9+
"pgo-benchmark": "true",
10+
"pg-cluster": "{{.ClusterName}}",
11+
"created": "{{.Created}}"
12+
}
13+
},
14+
"spec": {
15+
"backoffLimit": 0,
16+
"template": {
17+
"metadata": {
18+
"name": "{{.JobName}}",
19+
"labels": {
20+
"vendor": "crunchydata",
21+
"pgo-benchmark": "true",
22+
"pg-cluster": "{{.ClusterName}}",
23+
"created": "{{.Created}}"
24+
}
25+
},
26+
"spec": {
27+
"containers": [
28+
{
29+
"name": "pgbench",
30+
"image": "{{.CCPImagePrefix}}/crunchy-pgbench:{{.CCPImageTag}}",
31+
"env": [
32+
{
33+
"name": "PG_DATABASE",
34+
"value": "{{.PGDatabase}}"
35+
},
36+
{
37+
"name": "PG_HOSTNAME",
38+
"value": "{{.PGHost}}"
39+
},
40+
{
41+
"name": "PG_PORT",
42+
"value": "{{.PGPort}}"
43+
},
44+
{
45+
"name": "PG_PASSWORD",
46+
"valueFrom": {
47+
"secretKeyRef": {
48+
"name": "{{.PGUserSecret}}",
49+
"key": "password"
50+
}
51+
}
52+
},
53+
{
54+
"name": "PG_USERNAME",
55+
"valueFrom": {
56+
"secretKeyRef": {
57+
"name": "{{.PGUserSecret}}",
58+
"key": "username"
59+
}
60+
}
61+
},
62+
{
63+
"name": "PGBENCH_BENCHMARK_OPTS",
64+
"value": "{{.PGBenchOpts}}"
65+
},
66+
{
67+
"name": "PGBENCH_INIT_OPTS",
68+
"value": "{{.PGBenchInitOpts}}"
69+
},
70+
{
71+
"name": "PGBENCH_CLIENTS",
72+
"value": "{{.PGBenchClients}}"
73+
},
74+
{
75+
"name": "PGBENCH_JOBS",
76+
"value": "{{.PGBenchJobs}}"
77+
},
78+
{
79+
"name": "PGBENCH_SCALE",
80+
"value": "{{.PGBenchScale}}"
81+
},
82+
{
83+
"name": "PGBENCH_TRANSACTIONS",
84+
"value": "{{.PGBenchTransactions}}"
85+
}
86+
],
87+
"volumeMounts": [
88+
{
89+
"mountPath": "/pgconf",
90+
"name": "pgconf-volume"
91+
}
92+
]
93+
}
94+
],
95+
"volumes": [
96+
{
97+
"name": "pgconf-volume",
98+
{{.PGBenchConfigMap}}
99+
}
100+
],
101+
"restartPolicy": "Never"
102+
}
103+
}
104+
}
105+
}

‎chart/postgres-operator/files/postgres-operator/pgo.lspvc-template.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
}
1212
},
1313
"spec": {
14+
15+
{{.NodeSelector}}
16+
1417
"restartPolicy": "Never",
1518
"containers": [{
1619
"name": "lspvc",

‎chart/postgres-operator/files/postgres-operator/rmdata-job.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"apiVersion": "batch/v1",
33
"kind": "Job",
44
"metadata": {
5-
"name": "rmdata-{{.Name}}",
5+
"name": "{{.JobName}}",
66
"labels": {
77
"vendor": "crunchydata",
88
"pgrmdata": "true",
99
"pg-cluster": "{{.ClusterName}}",
10-
"pg-database": "{{.Name}}",
10+
"pg-database": "{{.ClusterName}}",
1111
"claimName": "{{.PvcName}}"
1212
}
1313
},
1414
"spec": {
1515
"backoffLimit": 0,
1616
"template": {
1717
"metadata": {
18-
"name": "rmdata-{{.Name}}",
18+
"name": "{{.JobName}}",
1919
"labels": {
2020
"vendor": "crunchydata",
2121
"pgrmdata": "true",
2222
"pg-cluster": "{{.ClusterName}}",
23-
"pg-database": "{{.Name}}",
23+
"pg-database": "{{.ClusterName}}",
2424
"claimName": "{{.PvcName}}"
2525
}
2626
},

‎chart/postgres-operator/templates/_pgo.tpl.yaml‎

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 -}}

0 commit comments

Comments
 (0)