Skip to content

Commit 0bddc41

Browse files
TheBigLeeTheBigLee
authored
Merge pull request #1111 from vshn/dependencies/2026-03
Update dependencies
2 parents 57a714e + 11d03de commit 0bddc41

File tree

117 files changed

+1846
-1027
lines changed

Some content is hidden

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

117 files changed

+1846
-1027
lines changed

‎class/defaults.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ parameters:
2121
version: 7.1.8
2222
nextcloud:
2323
source: https://nextcloud.github.io/helm/
24-
version: 8.8.2
24+
version: 8.9.1
2525
forgejo:
2626
source: oci://code.forgejo.org/forgejo-helm/forgejo
2727
version: 16.2.0
2828
cnpg:
2929
source: https://cloudnative-pg.io/charts/
30-
version: 0.27.0
30+
version: 0.27.1
3131
# Be aware that the cnpg post-process filter will append "-ubiX" to the operator image.
3232
# The UBI version might increase with newer versions, so check with skopeo first:
3333
# skopeo list-tags docker://ghcr.io/cloudnative-pg/cloudnative-pg
@@ -46,11 +46,11 @@ parameters:
4646
cnpgBarmanPlugin:
4747
# https://artifacthub.io/packages/helm/cloudnative-pg/plugin-barman-cloud
4848
source: https://cloudnative-pg.io/charts/
49-
version: 0.4.0
49+
version: 0.5.0
5050
chartName: plugin-barman-cloud
5151
garageOperator:
5252
source: oci://ghcr.io/rajsinghtech/charts/garage-operator
53-
version: 0.0.41
53+
version: 0.1.4
5454
images:
5555
provider-kubernetes:
5656
registry: ghcr.io
@@ -59,7 +59,7 @@ parameters:
5959
provider-helm:
6060
registry: ghcr.io
6161
repository: crossplane-contrib/provider-helm
62-
tag: v1.0.4
62+
tag: v1.2.0
6363
provider-exoscale:
6464
registry: ghcr.io
6565
repository: vshn/provider-exoscale

‎tests/golden/control-plane/appcat/appcat/10_provider_helm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: provider-helm
99
name: provider-helm
1010
spec:
11-
package: ghcr.io/crossplane-contrib/provider-helm:v1.0.4
11+
package: ghcr.io/crossplane-contrib/provider-helm:v1.2.0
1212
packagePullPolicy: IfNotPresent
1313
runtimeConfigRef:
1414
name: provider-helm

‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
bucketRegion: lpg
3434
busybox_image: docker.io/library/busybox
3535
chartRepository: https://nextcloud.github.io/helm/
36-
chartVersion: 8.8.2
36+
chartVersion: 8.9.1
3737
cloudProvider: cloudscale
3838
clusterName: c-green-test-1234
3939
collaboraCPULimit: '1'

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/instance: appcat
77
app.kubernetes.io/managed-by: Helm
88
app.kubernetes.io/name: cloudnative-pg
9-
app.kubernetes.io/version: 1.28.0
10-
helm.sh/chart: cloudnative-pg-0.27.0
9+
app.kubernetes.io/version: 1.28.1
10+
helm.sh/chart: cloudnative-pg-0.27.1
1111
name: cnpg-controller-manager-config
1212
namespace: syn-cnpg-system

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/crds/crds.yaml‎

Lines changed: 125 additions & 24 deletions
Large diffs are not rendered by default.

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/deployment.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
app.kubernetes.io/instance: appcat
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: cloudnative-pg
8-
app.kubernetes.io/version: 1.28.0
9-
helm.sh/chart: cloudnative-pg-0.27.0
8+
app.kubernetes.io/version: 1.28.1
9+
helm.sh/chart: cloudnative-pg-0.27.1
1010
name: appcat-cloudnative-pg
1111
namespace: syn-cnpg-system
1212
spec:
@@ -18,9 +18,9 @@ spec:
1818
template:
1919
metadata:
2020
annotations:
21-
checksum/config: c56a2a9b38d7ee9fbafdd45b08e199312c1e4b29069fb84bb1722d7d3649ec22
22-
checksum/monitoring-config: dafcabf6c42dd87953d965912dc0db1e25871e8165f553d0b9903c7c37b17e53
23-
checksum/rbac: 60995ba44db1c9a2663923419a191d463a9f50a88994a1279d13dcbc643e1686
21+
checksum/config: 3bb18efd43492f64393e0b3a822d6112ac962d8075fddb3a3ad8893925b37752
22+
checksum/monitoring-config: bc0322bcf7fedd5cc42cf396b5dacbb80696b4916865cf174119c71cca641e26
23+
checksum/rbac: b6788fd81bfaea5bd26c64f1c94e4815e8d46f4cc66fcf6932b61327e430511a
2424
labels:
2525
app.kubernetes.io/instance: appcat
2626
app.kubernetes.io/name: cloudnative-pg
@@ -36,7 +36,7 @@ spec:
3636
- /manager
3737
env:
3838
- name: OPERATOR_IMAGE_NAME
39-
value: ghcr.io/cloudnative-pg/cloudnative-pg:1.28.0
39+
value: ghcr.io/cloudnative-pg/cloudnative-pg:1.28.1
4040
- name: OPERATOR_NAMESPACE
4141
valueFrom:
4242
fieldRef:
@@ -45,12 +45,12 @@ spec:
4545
value: cnpg-default-monitoring
4646
- name: EXPIRING_CHECK_THRESHOLD
4747
value: '15'
48-
image: ghcr.io/cloudnative-pg/cloudnative-pg:1.28.0
48+
image: ghcr.io/cloudnative-pg/cloudnative-pg:1.28.1
4949
imagePullPolicy: IfNotPresent
5050
livenessProbe:
5151
httpGet:
5252
path: /readyz
53-
port: 9443
53+
port: webhook-server
5454
scheme: HTTPS
5555
initialDelaySeconds: 3
5656
name: manager
@@ -64,7 +64,7 @@ spec:
6464
readinessProbe:
6565
httpGet:
6666
path: /readyz
67-
port: 9443
67+
port: webhook-server
6868
scheme: HTTPS
6969
initialDelaySeconds: 3
7070
resources:
@@ -86,7 +86,7 @@ spec:
8686
failureThreshold: 6
8787
httpGet:
8888
path: /readyz
89-
port: 9443
89+
port: webhook-server
9090
scheme: HTTPS
9191
periodSeconds: 5
9292
volumeMounts:

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/monitoring-configmap.yaml‎

Lines changed: 77 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ data:
33
queries: |
44
backends:
55
query: |
6-
SELECT sa.datname
7-
, sa.usename
8-
, sa.application_name
9-
, states.state
10-
, COALESCE(sa.count, 0) AS total
11-
, COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
12-
FROM ( VALUES ('active')
13-
, ('idle')
14-
, ('idle in transaction')
15-
, ('idle in transaction (aborted)')
16-
, ('fastpath function call')
17-
, ('disabled')
18-
) AS states(state)
19-
LEFT JOIN (
20-
SELECT datname
21-
, state
22-
, usename
23-
, COALESCE(application_name, '') AS application_name
24-
, COUNT(*)
25-
, COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
26-
FROM pg_catalog.pg_stat_activity
27-
GROUP BY datname, state, usename, application_name
28-
) sa ON states.state = sa.state
29-
WHERE sa.usename IS NOT NULL
6+
SELECT sa.datname
7+
, sa.usename
8+
, sa.application_name
9+
, states.state
10+
, COALESCE(sa.count, 0) AS total
11+
, COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
12+
FROM ( VALUES ('active')
13+
, ('idle')
14+
, ('idle in transaction')
15+
, ('idle in transaction (aborted)')
16+
, ('fastpath function call')
17+
, ('disabled')
18+
) AS states(state)
19+
LEFT JOIN (
20+
SELECT datname
21+
, state
22+
, usename
23+
, COALESCE(application_name, '') AS application_name
24+
, COUNT(*)
25+
, COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
26+
FROM pg_catalog.pg_stat_activity
27+
GROUP BY datname, state, usename, application_name
28+
) sa ON states.state = sa.state
29+
WHERE sa.usename IS NOT NULL
3030
metrics:
3131
- datname:
3232
usage: "LABEL"
@@ -49,22 +49,22 @@ data:
4949
5050
backends_waiting:
5151
query: |
52-
SELECT count(*) AS total
53-
FROM pg_catalog.pg_locks blocked_locks
54-
JOIN pg_catalog.pg_locks blocking_locks
55-
ON blocking_locks.locktype = blocked_locks.locktype
56-
AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
57-
AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
58-
AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
59-
AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
60-
AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
61-
AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
62-
AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
63-
AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
64-
AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
65-
AND blocking_locks.pid != blocked_locks.pid
66-
JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
67-
WHERE NOT blocked_locks.granted
52+
SELECT count(*) AS total
53+
FROM pg_catalog.pg_locks blocked_locks
54+
JOIN pg_catalog.pg_locks blocking_locks
55+
ON blocking_locks.locktype = blocked_locks.locktype
56+
AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
57+
AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
58+
AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
59+
AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
60+
AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
61+
AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
62+
AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
63+
AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
64+
AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
65+
AND blocking_locks.pid != blocked_locks.pid
66+
JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
67+
WHERE NOT blocked_locks.granted
6868
metrics:
6969
- total:
7070
usage: "GAUGE"
@@ -102,16 +102,17 @@ data:
102102
description: "Time at which postgres started (based on epoch)"
103103
104104
pg_replication:
105-
query: "SELECT CASE WHEN (
106-
NOT pg_catalog.pg_is_in_recovery()
107-
OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())
108-
THEN 0
109-
ELSE GREATEST (0,
110-
EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
111-
END AS lag,
112-
pg_catalog.pg_is_in_recovery() AS in_recovery,
113-
EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
114-
(SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas"
105+
query: |
106+
SELECT CASE WHEN (
107+
NOT pg_catalog.pg_is_in_recovery()
108+
OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())
109+
THEN 0
110+
ELSE GREATEST (0,
111+
EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
112+
END AS lag,
113+
pg_catalog.pg_is_in_recovery() AS in_recovery,
114+
EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
115+
(SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas
115116
metrics:
116117
- lag:
117118
usage: "GAUGE"
@@ -167,6 +168,9 @@ data:
167168
, COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn
168169
, EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time
169170
FROM pg_catalog.pg_stat_archiver
171+
predicate_query: |
172+
SELECT NOT pg_catalog.pg_is_in_recovery()
173+
OR pg_catalog.current_setting('archive_mode') = 'always'
170174
metrics:
171175
- archived_count:
172176
usage: "COUNTER"
@@ -379,20 +383,20 @@ data:
379383
pg_stat_replication:
380384
primary: true
381385
query: |
382-
SELECT usename
383-
, COALESCE(application_name, '') AS application_name
384-
, COALESCE(client_addr::text, '') AS client_addr
385-
, COALESCE(client_port::text, '') AS client_port
386-
, EXTRACT(EPOCH FROM backend_start) AS backend_start
387-
, COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
388-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
389-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
390-
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
391-
, COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
392-
, COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
393-
, COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
394-
, COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
395-
FROM pg_catalog.pg_stat_replication
386+
SELECT usename
387+
, COALESCE(application_name, '') AS application_name
388+
, COALESCE(client_addr::text, '') AS client_addr
389+
, COALESCE(client_port::text, '') AS client_port
390+
, EXTRACT(EPOCH FROM backend_start) AS backend_start
391+
, COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
392+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
393+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
394+
, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
395+
, COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
396+
, COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
397+
, COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
398+
, COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
399+
FROM pg_catalog.pg_stat_replication
396400
metrics:
397401
- usename:
398402
usage: "LABEL"
@@ -452,13 +456,13 @@ data:
452456
pg_extensions:
453457
query: |
454458
SELECT
455-
current_database() as datname,
456-
name as extname,
457-
default_version,
458-
installed_version,
459-
CASE
460-
WHEN default_version = installed_version THEN 0
461-
ELSE 1
459+
current_database() as datname,
460+
name as extname,
461+
default_version,
462+
installed_version,
463+
CASE
464+
WHEN default_version = installed_version THEN 0
465+
ELSE 1
462466
END AS update_available
463467
FROM pg_catalog.pg_available_extensions
464468
WHERE installed_version IS NOT NULL
@@ -486,8 +490,8 @@ metadata:
486490
app.kubernetes.io/instance: appcat
487491
app.kubernetes.io/managed-by: Helm
488492
app.kubernetes.io/name: cloudnative-pg
489-
app.kubernetes.io/version: 1.28.0
493+
app.kubernetes.io/version: 1.28.1
490494
cnpg.io/reload: ''
491-
helm.sh/chart: cloudnative-pg-0.27.0
495+
helm.sh/chart: cloudnative-pg-0.27.1
492496
name: cnpg-default-monitoring
493497
namespace: syn-cnpg-system

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/mutatingwebhookconfiguration.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
app.kubernetes.io/instance: appcat
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: cloudnative-pg
8-
app.kubernetes.io/version: 1.28.0
9-
helm.sh/chart: cloudnative-pg-0.27.0
8+
app.kubernetes.io/version: 1.28.1
9+
helm.sh/chart: cloudnative-pg-0.27.1
1010
name: cnpg-mutating-webhook-configuration
1111
webhooks:
1212
- admissionReviewVersions:

‎tests/golden/control-plane/appcat/appcat/cnpg/helmchart/cloudnative-pg/templates/rbac.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ metadata:
77
app.kubernetes.io/instance: appcat
88
app.kubernetes.io/managed-by: Helm
99
app.kubernetes.io/name: cloudnative-pg
10-
app.kubernetes.io/version: 1.28.0
11-
helm.sh/chart: cloudnative-pg-0.27.0
10+
app.kubernetes.io/version: 1.28.1
11+
helm.sh/chart: cloudnative-pg-0.27.1
1212
name: appcat-cloudnative-pg
1313
namespace: syn-cnpg-system
1414
---
@@ -21,8 +21,8 @@ metadata:
2121
app.kubernetes.io/instance: appcat
2222
app.kubernetes.io/managed-by: Helm
2323
app.kubernetes.io/name: cloudnative-pg
24-
app.kubernetes.io/version: 1.28.0
25-
helm.sh/chart: cloudnative-pg-0.27.0
24+
app.kubernetes.io/version: 1.28.1
25+
helm.sh/chart: cloudnative-pg-0.27.1
2626
name: appcat-cloudnative-pg
2727
rules:
2828
- apiGroups:
@@ -261,8 +261,8 @@ metadata:
261261
app.kubernetes.io/instance: appcat
262262
app.kubernetes.io/managed-by: Helm
263263
app.kubernetes.io/name: cloudnative-pg
264-
app.kubernetes.io/version: 1.28.0
265-
helm.sh/chart: cloudnative-pg-0.27.0
264+
app.kubernetes.io/version: 1.28.1
265+
helm.sh/chart: cloudnative-pg-0.27.1
266266
name: appcat-cloudnative-pg-view
267267
rules:
268268
- apiGroups:
@@ -293,8 +293,8 @@ metadata:
293293
app.kubernetes.io/instance: appcat
294294
app.kubernetes.io/managed-by: Helm
295295
app.kubernetes.io/name: cloudnative-pg
296-
app.kubernetes.io/version: 1.28.0
297-
helm.sh/chart: cloudnative-pg-0.27.0
296+
app.kubernetes.io/version: 1.28.1
297+
helm.sh/chart: cloudnative-pg-0.27.1
298298
name: appcat-cloudnative-pg-edit
299299
rules:
300300
- apiGroups:
@@ -327,8 +327,8 @@ metadata:
327327
app.kubernetes.io/instance: appcat
328328
app.kubernetes.io/managed-by: Helm
329329
app.kubernetes.io/name: cloudnative-pg
330-
app.kubernetes.io/version: 1.28.0
331-
helm.sh/chart: cloudnative-pg-0.27.0
330+
app.kubernetes.io/version: 1.28.1
331+
helm.sh/chart: cloudnative-pg-0.27.1
332332
name: appcat-cloudnative-pg
333333
roleRef:
334334
apiGroup: rbac.authorization.k8s.io

0 commit comments

Comments
 (0)