Skip to content

[b/r] Add backup/restore labels for PVCs, swift-conf Secret, and ring ConfigMap#463

Open
stuggi wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
stuggi:backup_restore
Open

[b/r] Add backup/restore labels for PVCs, swift-conf Secret, and ring ConfigMap#463
stuggi wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
stuggi:backup_restore

Conversation

@stuggi
Copy link
Copy Markdown
Contributor

@stuggi stuggi commented Apr 1, 2026

Add backup/restore labels to Swift resources so they are included in backup and can be restored in the correct order:

  • Object storage PVCs: labels on VolumeClaimTemplate (new envs) + reconcilePVCLabels for existing PVCs. Restore order 00.
  • swift-conf Secret: labels at creation via SecretTemplates + reconcileSwiftConfLabels for existing envs. Restore order 10. This Secret contains swift_hash_path_prefix/suffix which cannot be regenerated without losing access to existing objects.
  • Ring ConfigMap (swift-ring-files): reconcileRingConfigMapLabels after rebalance job completes. Restore order 10.

Shared ensureBackupLabels helper in swift_common.go uses MergeFrom patch to avoid conflicts with concurrent updates.

Jira: OSPRH-22912
Jira: OSPRH-22913

Depends-On: openstack-k8s-operators/lib-common#680

… ConfigMap

Add backup/restore labels to Swift resources so they are included in
backup and can be restored in the correct order:

- Object storage PVCs: labels on VolumeClaimTemplate (new envs) +
  reconcilePVCLabels for existing PVCs. Restore order 00.
- swift-conf Secret: labels at creation via SecretTemplates +
  reconcileSwiftConfLabels for existing envs. Restore order 10.
  This Secret contains swift_hash_path_prefix/suffix which cannot be
  regenerated without losing access to existing objects.
- Ring ConfigMap (swift-ring-files): reconcileRingConfigMapLabels after
  rebalance job completes. Restore order 10.

Shared ensureBackupLabels helper in swift_common.go uses MergeFrom
patch to avoid conflicts with concurrent updates.

Jira: OSPRH-22912
Jira: OSPRH-22913

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
@openshift-ci openshift-ci bot requested a review from abays April 1, 2026 06:00
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot requested a review from fmount April 1, 2026 06:00
@openshift-ci openshift-ci bot added the approved label Apr 1, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

@stuggi: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/precommit-check 5b17842 link true /test precommit-check

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant