Skip to content

Commit fe09d85

Browse files
pooknullpooknull
authored
Merge branch 'main' into dev/K8SPG-737 
2 parents 3e552b8 + 9d8b028 commit fe09d85

26 files changed

Lines changed: 268 additions & 41 deletions

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ uninstall: ## Delete the postgrescluster CRD
120120
deploy: ## Deploy the PostgreSQL Operator (enables the postgrescluster controller)
121121
yq eval '(.spec.template.spec.containers[] | select(.name=="operator")).image = "$(IMAGE)"' ./deploy/operator.yaml \
122122
| yq eval '(.spec.template.spec.containers[] | select(.name=="operator") | .env[] | select(.name=="DISABLE_TELEMETRY") | .value) = "true"' - \
123+
| yq eval '(.spec.template.spec.containers[] | select(.name=="operator") | .env[] | select(.name=="LOG_LEVEL") | .value) = "DEBUG"' - \
123124
| kubectl apply -f -
124125

125126
.PHONY: undeploy

‎build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14023,6 +14023,15 @@ spec:
1402314023
type: boolean
1402414024
patroni:
1402514025
properties:
14026+
createReplicaMethods:
14027+
description: CreateReplicaMethods allows overriding create_replica_methods
14028+
for all instances.
14029+
items:
14030+
enum:
14031+
- basebackup
14032+
- pgbackrest
14033+
type: string
14034+
type: array
1402614035
dynamicConfiguration:
1402714036
description: |-
1402814037
Patroni dynamic configuration settings. Changes to this value will be

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8072,6 +8072,8 @@ spec:
80728072
type: boolean
80738073
pg_stat_monitor:
80748074
type: boolean
8075+
pg_stat_statements:
8076+
type: boolean
80758077
pgvector:
80768078
type: boolean
80778079
type: object
@@ -13353,6 +13355,15 @@ spec:
1335313355
type: boolean
1335413356
patroni:
1335513357
properties:
13358+
createReplicaMethods:
13359+
description: CreateReplicaMethods allows overriding create_replica_methods
13360+
for all instances.
13361+
items:
13362+
enum:
13363+
- basebackup
13364+
- pgbackrest
13365+
type: string
13366+
type: array
1335613367
dynamicConfiguration:
1335713368
description: |-
1335813369
Patroni dynamic configuration settings. Changes to this value will be

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8477,6 +8477,8 @@ spec:
84778477
type: boolean
84788478
pg_stat_monitor:
84798479
type: boolean
8480+
pg_stat_statements:
8481+
type: boolean
84808482
pgvector:
84818483
type: boolean
84828484
type: object
@@ -13758,6 +13760,15 @@ spec:
1375813760
type: boolean
1375913761
patroni:
1376013762
properties:
13763+
createReplicaMethods:
13764+
description: CreateReplicaMethods allows overriding create_replica_methods
13765+
for all instances.
13766+
items:
13767+
enum:
13768+
- basebackup
13769+
- pgbackrest
13770+
type: string
13771+
type: array
1376113772
dynamicConfiguration:
1376213773
description: |-
1376313774
Patroni dynamic configuration settings. Changes to this value will be

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13965,6 +13965,15 @@ spec:
1396513965
type: boolean
1396613966
patroni:
1396713967
properties:
13968+
createReplicaMethods:
13969+
description: CreateReplicaMethods allows overriding create_replica_methods
13970+
for all instances.
13971+
items:
13972+
enum:
13973+
- basebackup
13974+
- pgbackrest
13975+
type: string
13976+
type: array
1396813977
dynamicConfiguration:
1396913978
description: |-
1397013979
Patroni dynamic configuration settings. Changes to this value will be

‎deploy/bundle.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8774,6 +8774,8 @@ spec:
87748774
type: boolean
87758775
pg_stat_monitor:
87768776
type: boolean
8777+
pg_stat_statements:
8778+
type: boolean
87778779
pgvector:
87788780
type: boolean
87798781
type: object
@@ -14055,6 +14057,15 @@ spec:
1405514057
type: boolean
1405614058
patroni:
1405714059
properties:
14060+
createReplicaMethods:
14061+
description: CreateReplicaMethods allows overriding create_replica_methods
14062+
for all instances.
14063+
items:
14064+
enum:
14065+
- basebackup
14066+
- pgbackrest
14067+
type: string
14068+
type: array
1405814069
dynamicConfiguration:
1405914070
description: |-
1406014071
Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
3966139672
type: boolean
3966239673
patroni:
3966339674
properties:
39675+
createReplicaMethods:
39676+
description: CreateReplicaMethods allows overriding create_replica_methods
39677+
for all instances.
39678+
items:
39679+
enum:
39680+
- basebackup
39681+
- pgbackrest
39682+
type: string
39683+
type: array
3966439684
dynamicConfiguration:
3966539685
description: |-
3966639686
Patroni dynamic configuration settings. Changes to this value will be

‎deploy/cr.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,9 @@ spec:
495495
# max_worker_processes: 2
496496
# shared_buffers: 1GB
497497
# work_mem: 2MB
498+
# createReplicaMethods:
499+
# - pgbackrest
500+
# - basebackup
498501

499502
# extensions:
500503
# image: perconalab/percona-postgresql-operator:main
@@ -508,6 +511,7 @@ spec:
508511
# name: cluster1-extensions-secret
509512
# builtin:
510513
# pg_stat_monitor: true
514+
# pg_stat_statements: false
511515
# pg_audit: true
512516
# pgvector: false
513517
# pg_repack: false

‎deploy/crd.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8774,6 +8774,8 @@ spec:
87748774
type: boolean
87758775
pg_stat_monitor:
87768776
type: boolean
8777+
pg_stat_statements:
8778+
type: boolean
87778779
pgvector:
87788780
type: boolean
87798781
type: object
@@ -14055,6 +14057,15 @@ spec:
1405514057
type: boolean
1405614058
patroni:
1405714059
properties:
14060+
createReplicaMethods:
14061+
description: CreateReplicaMethods allows overriding create_replica_methods
14062+
for all instances.
14063+
items:
14064+
enum:
14065+
- basebackup
14066+
- pgbackrest
14067+
type: string
14068+
type: array
1405814069
dynamicConfiguration:
1405914070
description: |-
1406014071
Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
3966139672
type: boolean
3966239673
patroni:
3966339674
properties:
39675+
createReplicaMethods:
39676+
description: CreateReplicaMethods allows overriding create_replica_methods
39677+
for all instances.
39678+
items:
39679+
enum:
39680+
- basebackup
39681+
- pgbackrest
39682+
type: string
39683+
type: array
3966439684
dynamicConfiguration:
3966539685
description: |-
3966639686
Patroni dynamic configuration settings. Changes to this value will be

‎deploy/cw-bundle.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8774,6 +8774,8 @@ spec:
87748774
type: boolean
87758775
pg_stat_monitor:
87768776
type: boolean
8777+
pg_stat_statements:
8778+
type: boolean
87778779
pgvector:
87788780
type: boolean
87798781
type: object
@@ -14055,6 +14057,15 @@ spec:
1405514057
type: boolean
1405614058
patroni:
1405714059
properties:
14060+
createReplicaMethods:
14061+
description: CreateReplicaMethods allows overriding create_replica_methods
14062+
for all instances.
14063+
items:
14064+
enum:
14065+
- basebackup
14066+
- pgbackrest
14067+
type: string
14068+
type: array
1405814069
dynamicConfiguration:
1405914070
description: |-
1406014071
Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
3966139672
type: boolean
3966239673
patroni:
3966339674
properties:
39675+
createReplicaMethods:
39676+
description: CreateReplicaMethods allows overriding create_replica_methods
39677+
for all instances.
39678+
items:
39679+
enum:
39680+
- basebackup
39681+
- pgbackrest
39682+
type: string
39683+
type: array
3966439684
dynamicConfiguration:
3966539685
description: |-
3966639686
Patroni dynamic configuration settings. Changes to this value will be

‎e2e-tests/tests/monitoring-pmm3/06-check-pgstatstatements-query-source.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ commands:
77

88
source ../../functions
99

10-
kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{"spec":{"pmm":{"querySource":"pgstatstatements"}}}'
10+
kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{
11+
"spec":{
12+
"pmm":{"querySource":"pgstatstatements"},
13+
"extensions": {"builtin": {"pg_stat_statements": true }}}
14+
}
15+
'
1116

1217
# Wait for the pg_stat_statements extension to be created
1318
sleep 80
1419

1520
primary=$(get_pod_by_role monitoring-pmm3 primary name)
16-
res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
17-
echo ${res} | grep -q pg_stat_statements
21+
kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT * FROM pg_extension;"'
22+
if ! kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"' | grep pg_stat_statements; then
23+
echo "pg_stat_statements is not found in pg_extension"
24+
fi
25+
timeout: 360

0 commit comments

Comments
 (0)