feat( cluster ): plugins and barman cloud cnpg-i plugin support#924

Open

itay-grudev wants to merge 44 commits into

mainfrom

feat/barman-plugin-support

itay-grudev commented Jun 20, 2026 •

edited

Loading

Collaborator

Migrating from the Built-in CloudNativePG Backup to the Barman Cloud CNPG-I
plugin is a straightforward, single step process, as the chart creates the
necessary ObjectStore resource as a helm hook before the cluster is updated.

All you have to do is change the backup method from barmanObjectStore to
plugin and specify the plugin name. The same change should also be applied to
your scheduled backups.

backups:
  enabled: true
- method: barmanObjectStore
+ method: plugin
+ pluginConfiguration:
+   name: barman-cloud.cloudnative-pg.io
  scheduledBackups:
    - name: daily-backup
      schedule: "0 0 0 * * *"
      backupOwnerReference: self
-     method: barmanObjectStore
+     method: plugin
+     pluginConfiguration:
+       name: barman-cloud.cloudnative-pg.io

closes: #830
closes: #910
closes: #838
closes: #775

itay-grudev added 9 commits

June 19, 2026 22:27


          feat( cluster ): Barman Cloud CNPG-I plugin support

52e7e38

Signed-off-by: Itay Grudev <itay@verito.digital>


          ci: installing cert manager and the Barman CNPG-I plugin

49b78f9

Signed-off-by: Itay Grudev <itay@verito.digital>


          added instanceSidecarConfiguration

74b2154

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: plugin section not working correctly

5f0ab22

Signed-off-by: Itay Grudev <itay@verito.digital>


          barman plugin e2e chainsaw prototype tests

c42be2b

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: recovery plugin cluster external cluster configuration

089abe9

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix incorrect schema

03d0f2c

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: scheduled backups test - match only the immediate daily test

58fe5cc

Signed-off-by: Itay Grudev <itay@verito.digital>


          test: incorrect cluster iname in barman-plugin-backup-restore test

e1175c9

Signed-off-by: Itay Grudev <itay@verito.digital>

itay-grudev requested review from fcanovai, gbartolini, leonardoce and phisco as code owners

June 20, 2026 12:43

itay-grudev added the chart( cluster ) label

itay-grudev requested a review from mnencia as a code owner

June 20, 2026 12:43

dosubot Bot added the size:L label


          fix lint

f7c7496

Signed-off-by: Itay Grudev <itay@verito.digital>

NigelVanHattum mentioned this pull request

The plugins is missing in the cluster helm chart #634

Open

This was referenced Jul 2, 2026

test(cluster): fix flaky barman-plugin-migration upgrading assertion aqeelat/cnpg-charts#1

Open

test(cluster): fix barman-plugin-migration test assertions #938

Closed

tuunit and others added 10 commits

July 3, 2026 10:44


          fix: plugin-barman-cloud likeness and readiness probes (#776)

06da8c7

Signed-off-by: Nolan Gilley <nkgilley@gmail.com>
Signed-off-by: Jan Larwig <jan@larwig.com>
Signed-off-by: Itay Grudev <itay+github.com@grudev.com>
Co-authored-by: Nolan Gilley <nkgilley@gmail.com>
Co-authored-by: Itay Grudev <itay+github.com@grudev.com>


          chore(deps): update actions/setup-python action to v6.3.0 (#927)

ccdf158

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update azure/setup-helm action to v5.0.1 (#926)

4e2b126

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Itay Grudev <itay@verito.digital>


          fix: when is the main plugins section specified

fe2a74a

Signed-off-by: Itay Grudev <itay@verito.digital>


          explicitly specifying backup pluginConfiguration

042e216

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: objectstore is now a helm hook to ensure it exists before the cl…

9b8ac18

…uster

Signed-off-by: Itay Grudev <itay@verito.digital>


          recovery s3 creds not provided on recovery

dd101f2

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: backup import and pg_basebackup do not require s3 creds

e9ad801

Signed-off-by: Itay Grudev <itay@verito.digital>


          debug logs on failure for plugin migration

b4a6383

Signed-off-by: Itay Grudev <itay@verito.digital>


          deleted backups during cleanup to speed up cleanup

ff2ecd3

Signed-off-by: Itay Grudev <itay@verito.digital>

itay-grudev added 18 commits

July 3, 2026 10:44


          fix: incorrect recovery-s3-creds condition

92748c6

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: typo in the external clusters section

af4266e

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: test step order - no base backup

84dce7b

Signed-off-by: Itay Grudev <itay@verito.digital>


          faster cleanup by removing backups

330e6f2

Signed-off-by: Itay Grudev <itay@verito.digital>


          simpler upgrade procedure because the objectstore is a helm hook

04eeafd

Signed-off-by: Itay Grudev <itay@verito.digital>


          removed backup running assert as it is unreliable. keeping completed …

5ffc521

…only

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: missing minio/mc image tag

52a50db

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: migration test timeout and improved debug logs

9eac004

Signed-off-by: Itay Grudev <itay@verito.digital>


          fixed hook annotations

926f107

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix duplicated line

3d66b4e

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: ability to override the barman plugin configuration

186432d

Signed-off-by: Itay Grudev <itay@verito.digital>


          ability to override enabled and isWALArchiver

46087c6

Signed-off-by: Itay Grudev <itay@verito.digital>


          test for plugin configuration passthrough

f9f7d53

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: plugin configuration passthrough

fa31bef

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: updated objectstore condition based on the new configuration opt…

5da6157

…ions

Signed-off-by: Itay Grudev <itay@verito.digital>


          added pre-rollback hooks to the objectstores

ce2f145

Signed-off-by: Itay Grudev <itay@verito.digital>


          added an additional upgrade assertion

fe51d30

Signed-off-by: Itay Grudev <itay@verito.digital>


          fix: typo in test

0ac2b24

Signed-off-by: Itay Grudev <itay@verito.digital>

itay-grudev force-pushed the feat/barman-plugin-support branch from 20e887c to 0ac2b24 Compare

July 3, 2026 07:45

itay-grudev and others added 5 commits

July 3, 2026 11:09


          Merge branch 'main' into feat/barman-plugin-support

24c40df


          test(cluster): fix barman-plugin-migration test assertions

14d5340

The barman-plugin-migration chainsaw test fails consistently in CI. The
migration itself works correctly (verified against operator source and the
plugin migration docs); the failures are in test assertions of transient
states, plus one secret-name typo.

- Migration 'Upgrading cluster' phase (step 4): status.phase is set for only
  a fraction of a second (the operator models rollouts as PhaseUpgrade ->
  PhaseWaitingForInstancesToBeActive, see tests/e2e/probes_test.go), and
  helm --wait does not gate CNPG CRDs, so polling always missed it. Replaced
  with a polling assert on the persistent UpgradingInstance Event.

- Backup 'running' phase (step 5): the backup completes in ~10s, faster than
  polling. Replaced with a polling assert on the persistent backup 'Starting'
  Event (backup_controller.go:337).

- PITR secret name (step 8): referenced recovery-backup-pitr-superuser
  (release name) instead of recovery-backup-pitr-cluster-superuser (cluster
  name), causing CreateContainerConfigError. Fixed.

Verified end-to-end in isolated fork CI (identical test( cluster )
workflow), including PITR recovery.

Signed-off-by: Abdullah Alaqel <abdullah.t.aqeel@gmail.com>
Signed-off-by: Abdullah Alaqeel <abdullah.t.aqeel@gmail.com>


          added migration documentation

2440ed6

Signed-off-by: Itay Grudev <itay@verito.digital>


          improved notes when using a backup plugin

2a226bd

Signed-off-by: Itay Grudev <itay@verito.digital>


          fixed typo in the README

cc9d409

Signed-off-by: Itay Grudev <itay@verito.digital>

This was referenced Jul 6, 2026

test(cluster): raise scheduledbackups cleanup timeout to 10m #940

Closed

feat(cluster): expose stopDelay for fast scheduledbackups cleanup #941

Merged


          feat(cluster): expose stopDelay for fast scheduledbackups cleanup (#941)

7ae47cb

The barman-plugin-scheduledbackups test intermittently fails with
'context deadline exceeded' during cleanup. The chart forces immediate:
true on scheduled backups (templates/scheduled-backups.yaml), so a backup
is still running when cleanup starts; Barman blocks instance shutdown
until it completes, pushing teardown past the 5m cleanup budget on GitHub
runners.

Expose cluster.stopDelay in the chart (values + schema + template), mapping
to the CNPG Cluster spec.stopDelay, which also sets the pod's
terminationGracePeriodSeconds. The scheduledbackups test sets stopDelay: 30
so the instance is force-stopped promptly at teardown, interrupting the
still-running backup. That's acceptable because this test only verifies a
backup is started from the ScheduledBackup; backup success is covered by
barman-plugin-backup-restore.

Result: passes reliably and runs in ~75s (down from ~6m, previously timing
out). Verified green in fork CI. This is the 'help it clean up faster'
approach rather than raising the cleanup timeout.

Supersedes #940. Supplements #924.

Signed-off-by: Abdullah Alaqeel <abdullah.t.aqeel@gmail.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

At least 1 approving review is required to merge this pull request.

Labels

chart( cluster ) size:L