Skip to content

Commit e890d3c

Browse files
authored
Merge branch 'main' into pgadmin-oauth-secrets
2 parents b96dc12 + 39d291d commit e890d3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1337
-518
lines changed

.github/workflows/test.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
with:
6868
k3s-channel: "${{ matrix.kubernetes }}"
6969
prefetch-images: |
70-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-0
71-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-3
72-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2
70+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1
71+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4
72+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
7373
7474
- run: make createnamespaces check-envtest-existing
7575
env:
@@ -101,16 +101,16 @@ jobs:
101101
with:
102102
k3s-channel: "${{ matrix.kubernetes }}"
103103
prefetch-images: |
104-
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-34
105-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-0
106-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-3
104+
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35
105+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1
106+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4
107107
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest
108108
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest
109-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2
110-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.3-2
111-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.4-2
112-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.2-2
113-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.2-3.4-2
109+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
110+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0
111+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0
112+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0
113+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0
114114
- run: go mod download
115115
- name: Build executable
116116
run: PGO_VERSION='${{ github.sha }}' make build-postgres-operator
@@ -132,17 +132,17 @@ jobs:
132132
--env 'CHECK_FOR_UPGRADES=false' \
133133
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
134134
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
135-
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-34' \
136-
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-0' \
137-
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-3' \
135+
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35' \
136+
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1' \
137+
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4' \
138138
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest' \
139139
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest' \
140-
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2' \
141-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.3-2' \
142-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.4-2' \
143-
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.2-2' \
144-
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.2-3.4-2' \
145-
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-1' \
140+
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0' \
141+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0' \
142+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0' \
143+
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0' \
144+
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0' \
145+
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-2' \
146146
--env 'RELATED_IMAGE_COLLECTOR=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.119.0' \
147147
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true' \
148148
--name 'postgres-operator' ubuntu \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 15
229229
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 16
230230
generate-kuttl: export KUTTL_PG_VERSION ?= 16
231231
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.4
232-
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2
232+
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
233233
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
234234
generate-kuttl: ## Generate kuttl tests
235235
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,12 @@ spec:
15841584
backing this claim.
15851585
type: string
15861586
type: object
1587+
x-kubernetes-map-type: atomic
1588+
x-kubernetes-validations:
1589+
- message: missing accessModes
1590+
rule: 0 < size(self.accessModes)
1591+
- message: missing storage request
1592+
rule: has(self.resources.requests.storage)
15871593
image:
15881594
description: The image name to use for pgAdmin instance.
15891595
type: string

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

Lines changed: 101 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,86 @@ spec:
3939
spec:
4040
description: PostgresClusterSpec defines the desired state of PostgresCluster
4141
properties:
42+
authentication:
43+
properties:
44+
rules:
45+
description: 'More info: https://www.postgresql.org/docs/current/auth-pg-hba-conf.html'
46+
items:
47+
properties:
48+
connection:
49+
description: |-
50+
The connection transport this rule matches. Typical values are:
51+
1. "host" for network connections that may or may not be encrypted.
52+
2. "hostssl" for network connections encrypted using TLS.
53+
3. "hostgssenc" for network connections encrypted using GSSAPI.
54+
maxLength: 20
55+
minLength: 1
56+
pattern: ^[-a-z0-9]+$
57+
type: string
58+
databases:
59+
description: Which databases this rule matches. When omitted
60+
or empty, this rule matches all databases.
61+
items:
62+
maxLength: 63
63+
minLength: 1
64+
type: string
65+
maxItems: 20
66+
type: array
67+
x-kubernetes-list-type: atomic
68+
hba:
69+
description: One line of the "pg_hba.conf" file. Changes
70+
to this value will be automatically reloaded without validation.
71+
maxLength: 100
72+
minLength: 1
73+
pattern: ^[[:print:]]+$
74+
type: string
75+
x-kubernetes-validations:
76+
- message: cannot include other files
77+
rule: '!self.trim().startsWith("include")'
78+
method:
79+
description: |-
80+
The authentication method to use when a connection matches this rule.
81+
The special value "reject" refuses connections that match this rule.
82+
More info: https://www.postgresql.org/docs/current/auth-methods.html
83+
maxLength: 20
84+
minLength: 1
85+
pattern: ^[-a-z0-9]+$
86+
type: string
87+
x-kubernetes-validations:
88+
- message: the "trust" method is unsafe
89+
rule: self != "trust"
90+
options:
91+
additionalProperties:
92+
anyOf:
93+
- type: integer
94+
- type: string
95+
x-kubernetes-int-or-string: true
96+
maxProperties: 20
97+
type: object
98+
x-kubernetes-map-type: atomic
99+
users:
100+
description: Which user names this rule matches. When omitted
101+
or empty, this rule matches all users.
102+
items:
103+
maxLength: 63
104+
minLength: 1
105+
type: string
106+
maxItems: 20
107+
type: array
108+
x-kubernetes-list-type: atomic
109+
type: object
110+
x-kubernetes-map-type: atomic
111+
x-kubernetes-validations:
112+
- message: '"hba" cannot be combined with other fields'
113+
rule: 'has(self.hba) ? !has(self.connection) && !has(self.databases)
114+
&& !has(self.method) && !has(self.options) && !has(self.users)
115+
: true'
116+
- message: '"connection" and "method" are required'
117+
rule: 'has(self.hba) ? true : has(self.connection) && has(self.method)'
118+
maxItems: 10
119+
type: array
120+
x-kubernetes-list-type: atomic
121+
type: object
42122
backups:
43123
description: PostgreSQL backup configuration
44124
properties:
@@ -3117,13 +3197,12 @@ spec:
31173197
to the PersistentVolume backing this claim.
31183198
type: string
31193199
type: object
3200+
x-kubernetes-map-type: atomic
31203201
x-kubernetes-validations:
31213202
- message: missing accessModes
3122-
rule: has(self.accessModes) && size(self.accessModes)
3123-
> 0
3203+
rule: 0 < size(self.accessModes)
31243204
- message: missing storage request
3125-
rule: has(self.resources) && has(self.resources.requests)
3126-
&& has(self.resources.requests.storage)
3205+
rule: has(self.resources.requests.storage)
31273206
required:
31283207
- volumeClaimSpec
31293208
type: object
@@ -6444,13 +6523,12 @@ spec:
64446523
to the PersistentVolume backing this claim.
64456524
type: string
64466525
type: object
6526+
x-kubernetes-map-type: atomic
64476527
x-kubernetes-validations:
64486528
- message: missing accessModes
6449-
rule: has(self.accessModes) && size(self.accessModes)
6450-
> 0
6529+
rule: 0 < size(self.accessModes)
64516530
- message: missing storage request
6452-
rule: has(self.resources) && has(self.resources.requests)
6453-
&& has(self.resources.requests.storage)
6531+
rule: has(self.resources.requests.storage)
64546532
required:
64556533
- volumeClaimSpec
64566534
type: object
@@ -10332,12 +10410,12 @@ spec:
1033210410
PersistentVolume backing this claim.
1033310411
type: string
1033410412
type: object
10413+
x-kubernetes-map-type: atomic
1033510414
x-kubernetes-validations:
1033610415
- message: missing accessModes
10337-
rule: has(self.accessModes) && size(self.accessModes) > 0
10416+
rule: 0 < size(self.accessModes)
1033810417
- message: missing storage request
10339-
rule: has(self.resources) && has(self.resources.requests)
10340-
&& has(self.resources.requests.storage)
10418+
rule: has(self.resources.requests.storage)
1034110419
metadata:
1034210420
description: Metadata contains metadata for custom resources
1034310421
properties:
@@ -10717,13 +10795,12 @@ spec:
1071710795
the PersistentVolume backing this claim.
1071810796
type: string
1071910797
type: object
10798+
x-kubernetes-map-type: atomic
1072010799
x-kubernetes-validations:
1072110800
- message: missing accessModes
10722-
rule: has(self.accessModes) && size(self.accessModes)
10723-
> 0
10801+
rule: 0 < size(self.accessModes)
1072410802
- message: missing storage request
10725-
rule: has(self.resources) && has(self.resources.requests)
10726-
&& has(self.resources.requests.storage)
10803+
rule: has(self.resources.requests.storage)
1072710804
name:
1072810805
description: |-
1072910806
The name for the tablespace, used as the path name for the volume.
@@ -11158,12 +11235,12 @@ spec:
1115811235
PersistentVolume backing this claim.
1115911236
type: string
1116011237
type: object
11238+
x-kubernetes-map-type: atomic
1116111239
x-kubernetes-validations:
1116211240
- message: missing accessModes
11163-
rule: has(self.accessModes) && size(self.accessModes) > 0
11241+
rule: 0 < size(self.accessModes)
1116411242
- message: missing storage request
11165-
rule: has(self.resources) && has(self.resources.requests)
11166-
&& has(self.resources.requests.storage)
11243+
rule: has(self.resources.requests.storage)
1116711244
required:
1116811245
- dataVolumeClaimSpec
1116911246
type: object
@@ -17248,6 +17325,12 @@ spec:
1724817325
PersistentVolume backing this claim.
1724917326
type: string
1725017327
type: object
17328+
x-kubernetes-map-type: atomic
17329+
x-kubernetes-validations:
17330+
- message: missing accessModes
17331+
rule: 0 < size(self.accessModes)
17332+
- message: missing storage request
17333+
rule: has(self.resources.requests.storage)
1725117334
image:
1725217335
description: |-
1725317336
Name of a container image that can run pgAdmin 4. Changing this value causes

config/manager/manager.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ spec:
2323
- name: CRUNCHY_DEBUG
2424
value: "true"
2525
- name: RELATED_IMAGE_POSTGRES_16
26-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2"
26+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0"
2727
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.3
28-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.3-2"
28+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0"
2929
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4
30-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.6-3.4-2"
30+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0"
3131
- name: RELATED_IMAGE_POSTGRES_17
32-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.2-2"
32+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0"
3333
- name: RELATED_IMAGE_POSTGRES_17_GIS_3.4
34-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.2-3.4-2"
34+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0"
3535
- name: RELATED_IMAGE_PGADMIN
36-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-34"
36+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35"
3737
- name: RELATED_IMAGE_PGBACKREST
38-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-0"
38+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1"
3939
- name: RELATED_IMAGE_PGBOUNCER
40-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-3"
40+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4"
4141
- name: RELATED_IMAGE_PGEXPORTER
4242
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest"
4343
- name: RELATED_IMAGE_PGUPGRADE
4444
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest"
4545
- name: RELATED_IMAGE_STANDALONE_PGADMIN
46-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-1"
46+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-2"
4747
- name: RELATED_IMAGE_COLLECTOR
4848
value: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.119.0"
4949
securityContext:

0 commit comments

Comments
 (0)