Skip to content

Commit c51f327

Browse files
rimuszrimusz
committed
bump to v2.1
1 parent e18f5de commit c51f327

File tree

11 files changed

+96
-104
lines changed

11 files changed

+96
-104
lines changed

‎chart/postgres-operator/Chart.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apiVersion: v1
22
description: CrunchyData Postgres Operator Helm chart
33
name: postgres-operator
4-
version: 0.1.0
4+
version: 0.1.3
5+
appVersion: 2.1.0
56
keywords:
6-
- postgresql
77
- postgres
88
- database
99
- sql
10+
- experimental
1011
home: https://www.crunchydata.com/
1112
icon: http://trusted-charts-logos.stackpoint.io/crunchy_logo.png
1213
sources:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
"spec": {
1717
"volumes": [{
1818
"name": "pgdata",
19-
{{.PVC_NAME}}
19+
{{.PvcName}}
2020
}],
2121

22-
{{.SECURITY_CONTEXT}}
22+
{{.SecurityContext}}
2323

2424
"containers": [{
2525
"name": "backup",
26-
"image": "crunchydata/crunchy-backup:{{.CCP_IMAGE_TAG}}",
26+
"image": "crunchydata/crunchy-backup:{{.CCPImageTag}}",
2727
"volumeMounts": [{
2828
"mountPath": "/pgdata",
2929
"name": "pgdata",
3030
"readOnly": false
3131
}],
3232
"env": [{
3333
"name": "BACKUP_HOST",
34-
"value": "{{.BACKUP_HOST}}"
34+
"value": "{{.BackupHost}}"
3535
}, {
3636
"name": "BACKUP_USER",
37-
"value": "{{.BACKUP_USER}}"
37+
"value": "{{.BackupUser}}"
3838
}, {
3939
"name": "BACKUP_PASS",
40-
"value": "{{.BACKUP_PASS}}"
40+
"value": "{{.BackupPass}}"
4141
}, {
4242
"name": "BACKUP_PORT",
43-
"value": "{{.BACKUP_PORT}}"
43+
"value": "{{.BackupPort}}"
4444
}]
4545
}],
4646
"restartPolicy": "Never"

‎chart/postgres-operator/files/cluster/affinity.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"preference": {
66
"matchExpressions": [{
77
"key": "kubernetes.io/hostname",
8-
"operator": "{{.OPERATOR}}",
8+
"operator": "{{.Operator}}",
99
"values": [
10-
"{{.NODE}}"
11-
]
12-
}]
13-
}
14-
}]
15-
}
10+
"{{.Node}}"
11+
]
12+
}]
13+
}
14+
}]
15+
}
1616
},

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "{{.Name}}",
66
"labels": {
7-
{{.OPERATOR_LABELS }}
7+
{{.OperatorLabels }}
88
}
99
},
1010
"spec": {
@@ -13,17 +13,17 @@
1313
"metadata": {
1414
"labels": {
1515
"name": "{{.Name}}",
16-
"master": "true",
16+
"primary": "true",
1717
"pg-cluster": "{{.ClusterName}}"
1818
}
1919
},
2020
"spec": {
2121

22-
{{.SECURITY_CONTEXT }}
22+
{{.SecurityContext }}
2323

2424
"containers": [{
2525
"name": "database",
26-
"image": "crunchydata/crunchy-postgres:{{.CCP_IMAGE_TAG}}",
26+
"image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
2727
"readinessProbe": {
2828
"exec": {
2929
"command": [
@@ -34,20 +34,20 @@
3434
"timeoutSeconds": 8
3535
},
3636
"env": [{
37-
"name": "PG_MASTER_PORT",
37+
"name": "PG_PRIMARY_PORT",
3838
"value": "{{.Port}}"
3939
}, {
4040
"name": "PG_MODE",
41-
"value": "master"
41+
"value": "primary"
4242
}, {
4343
"name": "PGDATA_PATH_OVERRIDE",
44-
"value": "{{.PGDATA_PATH_OVERRIDE}}"
44+
"value": "{{.DataPathOverride}}"
4545
}, {
4646
"name": "BACKUP_PATH",
47-
"value": "{{.BACKUP_PATH}}"
47+
"value": "{{.BackupPath}}"
4848
}, {
4949
"name": "PG_DATABASE",
50-
"value": "{{.PG_DATABASE}}"
50+
"value": "{{.Database}}"
5151
}, {
5252
"name": "PGHOST",
5353
"value": "/tmp"
@@ -62,13 +62,13 @@
6262
"readOnly": true
6363
}, {
6464
"mountPath": "/pguser",
65-
"name": "pguser-volume"
65+
"name": "user-volume"
6666
}, {
67-
"mountPath": "/pgmaster",
68-
"name": "pgmaster-volume"
67+
"mountPath": "/pgprimary",
68+
"name": "primary-volume"
6969
}, {
7070
"mountPath": "/pgroot",
71-
"name": "pgroot-volume"
71+
"name": "root-volume"
7272
}
7373

7474
],
@@ -82,30 +82,30 @@
8282
}],
8383
"volumes": [{
8484
"name": "pgdata",
85-
{{.PVC_NAME}}
85+
{{.PVCName}}
8686
}, {
8787
"name": "backup",
88-
{{.BACKUP_PVC_NAME}}
88+
{{.BackupPVCName}}
8989
}, {
90-
"name": "pguser-volume",
90+
"name": "user-volume",
9191
"secret": {
92-
"secretName": "{{.PGUSER_SECRET_NAME}}"
92+
"secretName": "{{.UserSecretName}}"
9393
}
9494
}, {
95-
"name": "pgmaster-volume",
95+
"name": "primary-volume",
9696
"secret": {
97-
"secretName": "{{.PGMASTER_SECRET_NAME}}"
97+
"secretName": "{{.PrimarySecretName}}"
9898
}
9999
}, {
100-
"name": "pgroot-volume",
100+
"name": "root-volume",
101101
"secret": {
102-
"secretName": "{{.PGROOT_SECRET_NAME}}"
102+
"secretName": "{{.RootSecretName}}"
103103
}
104104
}
105105

106106
],
107107

108-
{{.NODE_SELECTOR}}
108+
{{.NodeSelector}}
109109

110110
"restartPolicy": "Always",
111111
"dnsPolicy": "ClusterFirst"

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
"name": "{{.Name}}"
66
},
77
"spec": {
8-
"replicas": {{.REPLICAS}},
8+
"replicas": {{.Replicas}},
99
"template": {
1010
"metadata": {
1111
"labels": {
12-
{{.OPERATOR_LABELS}}
12+
{{.OperatorLabels}}
1313
}
1414
},
1515
"spec": {
1616

17-
{{.SECURITY_CONTEXT}}
17+
{{.SecurityContext}}
1818

1919
"containers": [{
2020
"name": "database",
21-
"image": "crunchydata/crunchy-postgres:{{.CCP_IMAGE_TAG}}",
21+
"image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
2222
"env": [{
23-
"name": "PG_MASTER_PORT",
23+
"name": "PG_PRIMARY_PORT",
2424
"value": "{{.Port}}"
2525
}, {
26-
"name": "PG_MASTER_HOST",
27-
"value": "{{.PG_MASTER_HOST}}"
26+
"name": "PG_PRIMARY_HOST",
27+
"value": "{{.PrimaryHost}}"
2828
}, {
2929
"name": "PG_MODE",
30-
"value": "slave"
30+
"value": "replica"
3131
}, {
3232
"name": "PG_DATABASE",
33-
"value": "{{.PG_DATABASE}}"
33+
"value": "{{.Database}}"
3434
}, {
3535
"name": "PGHOST",
3636
"value": "/tmp"
@@ -42,13 +42,13 @@
4242
"readOnly": false
4343
}, {
4444
"mountPath": "/pguser",
45-
"name": "pguser-volume"
45+
"name": "user-volume"
4646
}, {
47-
"mountPath": "/pgmaster",
48-
"name": "pgmaster-volume"
47+
"mountPath": "/pgprimary",
48+
"name": "primary-volume"
4949
}, {
5050
"mountPath": "/pgroot",
51-
"name": "pgroot-volume"
51+
"name": "root-volume"
5252
}
5353
],
5454

@@ -63,27 +63,27 @@
6363
{
6464
"name": "pgdata",
6565
"persistentVolumeClaim": {
66-
"claimName": "{{.PVC_NAME}}"
66+
"claimName": "{{.PVCName}}"
6767
}
6868
}, {
69-
"name": "pguser-volume",
69+
"name": "user-volume",
7070
"secret": {
71-
"secretName": "{{.PGUSER_SECRET_NAME}}"
71+
"secretName": "{{.UserSecretName}}"
7272
}
7373
}, {
74-
"name": "pgmaster-volume",
74+
"name": "primary-volume",
7575
"secret": {
76-
"secretName": "{{.PGMASTER_SECRET_NAME}}"
76+
"secretName": "{{.PrimarySecretName}}"
7777
}
7878
}, {
79-
"name": "pgroot-volume",
79+
"name": "root-volume",
8080
"secret": {
81-
"secretName": "{{.PGROOT_SECRET_NAME}}"
81+
"secretName": "{{.RootSecretName}}"
8282
}
8383
}
8484
],
8585

86-
{{.NODE_SELECTOR}}
86+
{{.NodeSelector}}
8787

8888
"restartPolicy": "Always",
8989
"dnsPolicy": "ClusterFirst"

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
"name": "{{.Name}}"
66
},
77
"spec": {
8-
"replicas": {{.REPLICAS}},
8+
"replicas": {{.Replicas}},
99
"template": {
1010
"metadata": {
1111
"labels": {
12-
{{.OPERATOR_LABELS}}
12+
{{.OperatorLabels}}
1313
}
1414
},
1515
"spec": {
1616

17-
{{.SECURITY_CONTEXT}}
17+
{{.SecurityContext}}
1818

1919
"containers": [{
2020
"name": "database",
21-
"image": "crunchydata/crunchy-postgres:{{.CCP_IMAGE_TAG}}",
21+
"image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
2222
"env": [{
23-
"name": "PG_MASTER_PORT",
23+
"name": "PG_PRIMARY_PORT",
2424
"value": "{{.Port}}"
2525
}, {
26-
"name": "PG_MASTER_HOST",
27-
"value": "{{.PG_MASTER_HOST}}"
26+
"name": "PG_PRIMARY_HOST",
27+
"value": "{{.PrimaryHost}}"
2828
}, {
2929
"name": "PG_MODE",
30-
"value": "slave"
30+
"value": "replica"
3131
}, {
3232
"name": "PG_DATABASE",
33-
"value": "{{.PG_DATABASE}}"
33+
"value": "{{.Database}}"
3434
}, {
3535
"name": "PGHOST",
3636
"value": "/tmp"
@@ -42,13 +42,13 @@
4242
"readOnly": false
4343
}, {
4444
"mountPath": "/pguser",
45-
"name": "pguser-volume"
45+
"name": "user-volume"
4646
}, {
47-
"mountPath": "/pgmaster",
48-
"name": "pgmaster-volume"
47+
"mountPath": "/pgprimary",
48+
"name": "primary-volume"
4949
}, {
5050
"mountPath": "/pgroot",
51-
"name": "pgroot-volume"
51+
"name": "root-volume"
5252
}
5353
],
5454

@@ -64,24 +64,24 @@
6464
"name": "pgdata",
6565
"emptyDir": {}
6666
}, {
67-
"name": "pguser-volume",
67+
"name": "user-volume",
6868
"secret": {
69-
"secretName": "{{.PGUSER_SECRET_NAME}}"
69+
"secretName": "{{.UserSecretName}}"
7070
}
7171
}, {
72-
"name": "pgmaster-volume",
72+
"name": "primary-volume",
7373
"secret": {
74-
"secretName": "{{.PGMASTER_SECRET_NAME}}"
74+
"secretName": "{{.PrimarySecretName}}"
7575
}
7676
}, {
77-
"name": "pgroot-volume",
77+
"name": "root-volume",
7878
"secret": {
79-
"secretName": "{{.PGROOT_SECRET_NAME}}"
79+
"secretName": "{{.RootSecretName}}"
8080
}
8181
}
8282
],
8383

84-
{{.NODE_SELECTOR}}
84+
{{.NodeSelector}}
8585

8686
"restartPolicy": "Always",
8787
"dnsPolicy": "ClusterFirst"

0 commit comments

Comments
 (0)