Skip to content

Commit b37e66c

Browse files
leonsteinhaeuserleonsteinhaeuser
authored
Merge branch 'CrunchyData:main' into main
2 parents 492a076 + 206cc6a commit b37e66c

23 files changed

+11779
-5665
lines changed

‎helm/install/Chart.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ name: pgo
33
description: Installer for PGO, the open source Postgres Operator from Crunchy Data
44

55
type: application
6-
version: 0.3.1
7-
appVersion: 5.1.1
6+
# The version below should match the version on the PostgresCluster CRD
7+
version: 0.6.0
8+
appVersion: 5.2.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.8.0
66
creationTimestamp: null
7-
name: pgupgrades.postgres-operator.crunchydata.com
87
labels:
98
app.kubernetes.io/name: pgo
10-
app.kubernetes.io/version: 5.1.1
9+
app.kubernetes.io/version: 5.2.0
10+
name: pgupgrades.postgres-operator.crunchydata.com
1111
spec:
1212
group: postgres-operator.crunchydata.com
1313
names:

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

Lines changed: 5854 additions & 2804 deletions
Large diffs are not rendered by default.

‎helm/install/templates/manager-upgrade.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ spec:
3636
{{- include "install.relatedImages" . | indent 8 }}
3737
securityContext:
3838
allowPrivilegeEscalation: false
39+
capabilities: { drop: [ALL] }
3940
readOnlyRootFilesystem: true
4041
runAsNonRoot: true

‎helm/install/templates/manager.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ spec:
4242
{{- end }}
4343
securityContext:
4444
allowPrivilegeEscalation: false
45+
capabilities: { drop: [ALL] }
4546
readOnlyRootFilesystem: true
4647
runAsNonRoot: true

‎helm/install/values.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +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.1.1-0
5-
upgrade: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade:ubi8-5.1.1-0
4+
cluster: registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi8-5.2.0-0
5+
upgrade: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade:ubi8-5.2.0-0
66

77
# relatedImages are used when an image is omitted from PostgresCluster or PGUpgrade specs.
88
relatedImages:
99
postgres_14:
10-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.3-0
10+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1
1111
postgres_14_gis_3.1:
12-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.3-3.1-0
12+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.5-3.1-1
1313
postgres_14_gis_3.2:
14-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.3-3.2-0
14+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.5-3.2-1
1515
postgres_13:
16-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.7-0
16+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.8-1
1717
postgres_13_gis_3.0:
18-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.7-3.0-0
18+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.8-3.0-1
1919
postgres_13_gis_3.1:
20-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.7-3.1-0
20+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.8-3.1-1
2121
pgadmin:
22-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-1
22+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-4
2323
pgbackrest:
24-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.38-1
24+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1
2525
pgbouncer:
26-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.16-3
26+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-1
2727
pgexporter:
28-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.1.1-0
28+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.2.0-0
2929
pgupgrade:
30-
image: registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.1.1-0
30+
image: registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.2.0-0
3131

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

‎helm/postgres/Chart.yaml‎

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

‎helm/postgres/templates/postgres.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ spec:
148148
{{ toYaml .Values.service | indent 4 }}
149149
{{- end }}
150150
{{- if .Values.dataSource }}
151-
service:
151+
dataSource:
152152
{{ toYaml .Values.dataSource | indent 4 }}
153153
{{- end }}
154154
{{- if .Values.databaseInitSQL }}

‎helm/postgres/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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.7-0
50+
# imagePostgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.8-1
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.38-1
54+
# imagePgBackRest: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1
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.16-3
58+
# imagePgBouncer: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-1
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.1.1-0
62+
# imageExporter: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.2.0-0
6363

6464
###########################
6565
# Basic Postgres Settings #

‎kustomize/azure/postgres.yaml‎

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

0 commit comments

Comments
 (0)