Skip to content

Commit f861947

Browse files
authored
Merge pull request #2 from CrunchyData/main
update
2 parents 7bb6fab + 4cb906b commit f861947

23 files changed

+102
-104
lines changed

helm/install/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ description: Installer for PGO, the open source Postgres Operator from Crunchy D
44

55
type: application
66
# The version below should match the version on the PostgresCluster CRD
7-
version: 5.3.0
8-
appVersion: 5.3.0
7+
version: 5.3.1
8+
appVersion: 5.3.1

helm/install/crds/postgres-operator.crunchydata.com_pgupgrades.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo
9-
app.kubernetes.io/version: 5.3.0
9+
app.kubernetes.io/version: 5.3.1
1010
name: pgupgrades.postgres-operator.crunchydata.com
1111
spec:
1212
group: postgres-operator.crunchydata.com

helm/install/crds/postgres-operator.crunchydata.com_postgresclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo
9-
app.kubernetes.io/version: 5.3.0
9+
app.kubernetes.io/version: 5.3.1
1010
name: postgresclusters.postgres-operator.crunchydata.com
1111
spec:
1212
group: postgres-operator.crunchydata.com

helm/install/values.yaml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,33 @@
11
---
22
# controllerImages are used to run the PostgresCluster and PGUpgrade controllers.
33
controllerImages:
4-
cluster: registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi8-5.3.0-0
5-
upgrade: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade:ubi8-5.3.0-0
4+
cluster: registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi8-5.3.1-0
5+
upgrade: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade:ubi8-5.3.1-0
66

77
# relatedImages are used when an image is omitted from PostgresCluster or PGUpgrade specs.
88
relatedImages:
99
postgres_15:
10-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.1-0
10+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
1111
postgres_15_gis_3.3:
12-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.1-3.3-0
12+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.2-3.3-0
1313
postgres_14:
14-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2
14+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
1515
postgres_14_gis_3.1:
16-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.1-2
16+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.1-0
1717
postgres_14_gis_3.2:
18-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.2-2
18+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.2-0
1919
postgres_14_gis_3.3:
20-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.3-2
21-
postgres_13:
22-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.9-2
23-
postgres_13_gis_3.0:
24-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.9-3.0-2
25-
postgres_13_gis_3.1:
26-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.9-3.1-2
20+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.3-0
2721
pgadmin:
28-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-8
22+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-10
2923
pgbackrest:
30-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2
24+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4
3125
pgbouncer:
32-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-5
26+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.18-0
3327
pgexporter:
34-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.0-0
28+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.1-0
3529
pgupgrade:
36-
image: registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.0-0
30+
image: registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0
3731

3832
# singleNamespace controls where PGO watches for PostgresClusters. When false,
3933
# PGO watches for and responds to PostgresClusters in all namespaces. When true,

helm/postgres/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name: postgrescluster
33
description: A Helm chart for Kubernetes
44
type: application
55
# The version below should match the version on the PostgresCluster CRD
6-
version: 5.3.0
7-
appVersion: 5.3.0
6+
version: 5.3.1
7+
appVersion: 5.3.1

helm/postgres/templates/_s3.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ repo{{ add .index 1 }}-s3-key={{ .s3.key }}
77
{{- end }}
88
{{- if .s3.keySecret }}
99
repo{{ add .index 1 }}-s3-key-secret={{ .s3.keySecret }}
10+
{{- end }}
11+
{{- if .s3.keyType }}
12+
repo{{ add .index 1 }}-s3-key-type={{ .s3.keyType }}
1013
{{- end }}
1114
{{- if .s3.encryptionPassphrase }}
1215
repo{{ add .index 1 }}-cipher-pass={{ .s3.encryptionPassphrase }}

helm/postgres/templates/postgres.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ spec:
191191
{{- if .Values.standby }}
192192
standby:
193193
enabled: {{ .Values.standby.enabled }}
194-
repoName: {{ required "repoName must be set when enabling standby mode." .Values.standby.repoName }}
194+
repoName: {{ .Values.standby.repoName }}
195+
host: {{ .Values.standby.host }}
196+
port: {{ .Values.standby.port }}
195197
{{- end }}
196198
{{- if .Values.supplementalGroups }}
197199
supplementalGroups:

helm/postgres/values.yaml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# available as one of the "RELATED_IMAGE_POSTGRES_..." images as part of the PGO
1616
# installation if you want to deploy the image without setting the "postgres"
1717
# image variable. This value is required.
18-
postgresVersion: 14
18+
postgresVersion: 15
1919

20-
# postGISVersion if sets and coupled with a PostGIS enabled container, enables
20+
# postGISVersion if set and coupled with a PostGIS enabled container, enables
2121
# PostGIS. This version number needs to be available as one of the
2222
# "RELATED_IMAGE_POSTGRES_..." images as part of the PGO installation if you
2323
# want to deploy the image without setting the "postgres" image variable.
@@ -35,7 +35,7 @@ postgresVersion: 14
3535
# pgBouncerReplicas: 1
3636

3737
# monitoring enables the ability to monitor the Postgres cluster through a
38-
# metrics exporter than can be scraped by Prometheus. This defaults to the value
38+
# metrics exporter that can be scraped by Prometheus. This defaults to the value
3939
# below.
4040
# monitoring: false
4141

@@ -47,19 +47,19 @@ postgresVersion: 14
4747
# below value. "postgresVersion" needs to match the version of Postgres that is
4848
# used here. If using the GIS-enabled Postgres image, you need to ensure
4949
# "postGISVersion" matches the version of PostGIS used.
50-
# imagePostgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.8-1
50+
# imagePostgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
5151

5252
# imagePgBackRest is the pgBackRest backup utility image. This defaults to the
5353
# below value.
54-
# imagePgBackRest: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2
54+
# imagePgBackRest: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4
5555

5656
# imagePgBouncer is the image for the PgBouncer connection pooler. This defaults
5757
# to the below value.
58-
# imagePgBouncer: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-5
58+
# imagePgBouncer: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.18-0
5959

6060
# imageExporter is the image name for the exporter used as a part of monitoring.
6161
# This defaults to the value below.
62-
# imageExporter: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.0-0
62+
# imageExporter: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.1-0
6363

6464
###########################
6565
# Basic Postgres Settings #
@@ -133,7 +133,7 @@ postgresVersion: 14
133133
# patroni: {}
134134

135135
# users sets any custom Postgres users and databases that they have access to
136-
# as well as any permissions assoicated with the user account.
136+
# as well as any permissions associated with the user account.
137137
# users: {}
138138

139139
# dataSource specifies a data source for bootstrapping a Postgres cluster.
@@ -149,21 +149,23 @@ postgresVersion: 14
149149
# provides the information for the replication user.
150150
# customReplicationTLSSecret: {}
151151

152-
# databaseInitSQL referencs a ConfigMap that contains a SQL file that should be
152+
# databaseInitSQL references a ConfigMap that contains a SQL file that should be
153153
# run a cluster bootstrap.
154154
# databaseInitSQL:
155155
# name: bootstrap-sql
156156
# key: bootstrap.sql
157157

158-
# standby sets whether or not to run this as a standby cluster. Both of the
159-
# values below are required to enable a standby cluster. Setting "enabled" to
160-
# "true" eunables the standby cluster while "repoName" points to a pgBackRest
161-
# archive to replay WAL files from.
158+
# standby sets whether to run this as a standby cluster. Setting "enabled" to
159+
# "true" enables the standby cluster while "repoName" points to a pgBackRest
160+
# archive to replay WAL files from, and "host" and "port" point to a primary
161+
# cluster from which to stream data.
162162
# standby:
163163
# enabled: false
164164
# repoName: repo1
165+
# host: "192.0.2.2"
166+
# port: 5432
165167

166-
# shutdown when set scales the entire workload to zero. By default this is not
168+
# shutdown when set scales the entire workload to zero. By default, this is not
167169
# set.
168170
# shutdown: true
169171

@@ -189,15 +191,17 @@ postgresVersion: 14
189191
# # endpoint specifies the S3 endpoint to use.
190192
# endpoint: ""
191193
# # region specifies the S3 region to use. If your S3 storage system does not
192-
# # use "region", fill this in with a random vaule.
194+
# # use "region", fill this in with a random value.
193195
# region: ""
194196
# # key is the S3 key. This is stored in a Secret.
195197
# key: ""
196-
# # keySecret is the S3 key secret. This is tored in a Secret.
198+
# # keySecret is the S3 key secret. This is stored in a Secret.
197199
# keySecret: ""
200+
# # keyType can be configured to enable IAM integration via AssumeRole
201+
# keyType: ""
198202
# # encryptionPassphrase is an optional parameter to enable encrypted backups
199203
# # with pgBackRest. This is encrypted by pgBackRest and does not use S3's
200-
# # built-in encrpytion system.
204+
# # built-in encryption system.
201205
# encryptionPassphrase: ""
202206

203207
# gcs allows for Google Cloud Storage (GCS) to be used for backups. This allows
@@ -217,7 +221,7 @@ postgresVersion: 14
217221
# azure:
218222
# # account is the name of the Azure account to be used.
219223
# account: ""
220-
# # key is the Secret key used associated with the Azure acount.
224+
# # key is the Secret key used associated with the Azure account.
221225
# key: ""
222226
# # container is the Azure container that the backups will be stored in.
223227
# container: ""
@@ -230,8 +234,8 @@ postgresVersion: 14
230234
# You can't set "multiBackupRepos" and any of the individual quickstarts at the
231235
# same time. "multiBackupRepos" will take precedence.
232236
#
233-
# Below is an example that enables one of each backup type. Note all of the
234-
# available quickstart options are presented below; please see the backup types
237+
# Below is an example that enables one of each backup type.
238+
# All available quickstart options are presented below; please see the backup types
235239
# if you want to see how each option works.
236240
# multiBackupRepos:
237241
# - volume:
@@ -242,6 +246,7 @@ postgresVersion: 14
242246
# region: ""
243247
# key: ""
244248
# keySecret: ""
249+
# keyType: ""
245250
# - gcs:
246251
# bucket: ""
247252
# key: |
@@ -259,15 +264,15 @@ postgresVersion: 14
259264
# Pooling / pgBouncer Settings #
260265
################################
261266

262-
# pgBouncerConfig sets all of the pgBouncer portion of the spec except for
267+
# pgBouncerConfig sets all of the pgBouncer portions of the spec except for
263268
# image. To set image, you need to set the "pgBouncer" setting.
264269
# pgBouncerConfig: {}
265270

266271
#######################
267272
# Monitoring Settings #
268273
#######################
269274

270-
# monitoringConfig sets all of the monitoring portion of the spec except for the
275+
# monitoringConfig sets all of the monitoring portions of the spec except for the
271276
# image. To set the image, which also enables monitoring, you need to set the
272277
# "monitoring" setting.
273278
# monitoringConfig: {}
@@ -278,7 +283,7 @@ postgresVersion: 14
278283

279284
# metadata contains any metadata that should be applied to all PGO managed
280285
# objects in this Postgres cluster. This includes "annotations" and "labels" as
281-
# subkeys.
286+
# sub-keys.
282287
# metadata: {}
283288

284289
# service customizes the Service that exposes the Postgres primary.
@@ -294,7 +299,7 @@ postgresVersion: 14
294299
# imagePullSecrets: []
295300

296301
# supplementalGroups sets any group IDs that should be assigned to
297-
# Pods, particularly around file system contraints within a system
302+
# Pods, particularly around file system constraints within a system
298303
# supplementalGroups: []
299304

300305
# disableDefaultPodScheduling if set to true, will disable any of the default
@@ -303,8 +308,8 @@ postgresVersion: 14
303308
# be used in addition to any customizations that are added in.
304309
# disableDefaultPodScheduling: false
305310

306-
# openshift can set explicitly if this is an OpenShift cluster, or a cluster
311+
# openshift can be set explicitly if this is an OpenShift cluster or a cluster
307312
# that uses a SecurityContextConstraint. This usually does not need to be set,
308-
# but you may want to explicitly set it to "false" when using a SCC like
313+
# but you may want to explicitly set it to "false" when using an SCC like
309314
# "anyuid"
310315
# openshift: false

kustomize/azure/postgres.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: PostgresCluster
33
metadata:
44
name: hippo-azure
55
spec:
6-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2
7-
postgresVersion: 14
6+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
7+
postgresVersion: 15
88
instances:
99
- dataVolumeClaimSpec:
1010
accessModes:
@@ -14,7 +14,7 @@ spec:
1414
storage: 1Gi
1515
backups:
1616
pgbackrest:
17-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2
17+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4
1818
configuration:
1919
- secret:
2020
name: pgo-azure-creds

kustomize/certmanager/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This example shows how to use custom self-signed certificates generated by Cert-
1111
The first step is to deploy Cert-Manager to the Kubernetes cluster. To do this, follow the instructions on the Cert-Manager website (https://cert-manager.io/docs/installation/).
1212

1313
## Setup Certificate Issuer
14-
After Cert-Manager has been deployed, the next step used in this example is to setup a Certificate Issuer. The Certificate Issuer can be configured to be local to a namespace or cluster wide. In the examples provided here, a cluster wide issuer is created.
14+
After Cert-Manager has been deployed, the next step used in this example is to set up a Certificate Issuer. The Certificate Issuer can be configured to be local to a namespace or cluster wide. In the examples provided here, a cluster wide issuer is created.
1515

1616
### Configure Issuer
1717

@@ -25,7 +25,7 @@ This Kustomize deployment performs the following actions:
2525
* Generates a common CA certificate.
2626
* Creates a cluster wide (ClusterIssuer) CA certificate issuer using the generated CA certificate.
2727

28-
By default the issues are created in the cert-manager namespace which is the default namespace for Cert-Manager.
28+
By default, the issues are created in the cert-manager namespace which is the default namespace for Cert-Manager.
2929

3030
The CA certificate issuer is important as the Postgres components require that the ca.crt be the same for the certificates generated to support Postgres.
3131

0 commit comments

Comments
 (0)