Skip to content

K8SPXC-1214: add .spec.backup.ttlSecondsAfterFinished field #2234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+248 −131
Open

K8SPXC-1214: add .spec.backup.ttlSecondsAfterFinished field #2234

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
269f369
K8SPXC-1214: add `.spec.backup.ttlSecondsAfterFinished` field
pooknull Nov 11, 2025
c970e4f
fix tests
pooknull Nov 14, 2025
2fdff9a
fix lint
pooknull Nov 14, 2025
114cb6d
fix test
pooknull Nov 17, 2025
676e7fb
Merge branch 'main' into K8SPXC-1214
pooknull Nov 20, 2025
9860c4b
address comments
pooknull Nov 24, 2025
f1ce7b6
Merge remote-tracking branch 'origin/main' into K8SPXC-1214
pooknull Nov 24, 2025
ff96f03
Merge branch 'main' into K8SPXC-1214
hors Nov 24, 2025
f2b1447
Merge remote-tracking branch 'origin/main' into K8SPXC-1214
pooknull Nov 27, 2025
bb12805
fix merge
pooknull Nov 27, 2025
c49d481
Merge remote-tracking branch 'origin/main' into K8SPXC-1214
pooknull Nov 28, 2025
6712009
address comments
pooknull Dec 1, 2025
5fc6fee
Merge remote-tracking branch 'origin/main' into K8SPXC-1214
pooknull Dec 1, 2025
77b4783
fix
pooknull Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,6 +1141,9 @@ spec:
suspendedDeadlineSeconds:
format: int64
type: integer
ttlSecondsAfterFinished:
format: int32
type: integer
type: object
crVersion:
type: string
Expand Down
3 changes: 3 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,6 +2184,9 @@ spec:
suspendedDeadlineSeconds:
format: int64
type: integer
ttlSecondsAfterFinished:
format: int32
type: integer
type: object
crVersion:
type: string
Expand Down
1 change: 1 addition & 0 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ spec:
backup:
# allowParallel: true
image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0-backup
# ttlSecondsAfterFinished: 3600
Copy link
Collaborator

@hors hors Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pooknull do we have helm chart PR?

Copy link
Contributor Author

@pooknull pooknull Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

percona/percona-helm-charts#716

# backoffLimit: 6
# activeDeadlineSeconds: 3600
# startingDeadlineSeconds: 300
Expand Down
3 changes: 3 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,6 +2184,9 @@ spec:
suspendedDeadlineSeconds:
format: int64
type: integer
ttlSecondsAfterFinished:
format: int32
type: integer
type: object
crVersion:
type: string
Expand Down
3 changes: 3 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,6 +2184,9 @@ spec:
suspendedDeadlineSeconds:
format: int64
type: integer
ttlSecondsAfterFinished:
format: int32
type: integer
type: object
crVersion:
type: string
Expand Down
1 change: 1 addition & 0 deletions ...ts/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup-k127-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...tests/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup-k127.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...ts/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup-k129-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...tests/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup-k129.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_restore-job-on-demand-backup-minio-demand-backup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,4 @@ spec:
secretName: some-name-vault
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...and-backup/compare/job_restore-job-on-demand-backup-pvc-bsource-demand-backup-k129-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...demand-backup/compare/job_restore-job-on-demand-backup-pvc-bsource-demand-backup-k129.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...s/demand-backup/compare/job_restore-job-on-demand-backup-pvc-bsource-demand-backup-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...ests/demand-backup/compare/job_restore-job-on-demand-backup-pvc-bsource-demand-backup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions ...ests/demand-backup/compare/job_restore-job-on-demand-backup-pvc-demand-backup-k129-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_restore-job-on-demand-backup-pvc-demand-backup-k129.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_restore-job-on-demand-backup-pvc-demand-backup-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_restore-job-on-demand-backup-pvc-demand-backup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,4 @@ spec:
secretName: demand-backup-ssl
- emptyDir: {}
name: bin
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_xb-on-demand-backup-minio-k129-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,4 @@ spec:
defaultMode: 420
optional: true
secretName: some-name-vault
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_xb-on-demand-backup-minio-k129.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,4 @@ spec:
defaultMode: 420
optional: true
secretName: some-name-vault
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_xb-on-demand-backup-minio-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@ spec:
defaultMode: 420
optional: true
secretName: some-name-vault
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/compare/job_xb-on-demand-backup-minio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,4 @@ spec:
defaultMode: 420
optional: true
secretName: some-name-vault
ttlSecondsAfterFinished: 3600
1 change: 1 addition & 0 deletions e2e-tests/demand-backup/conf/demand-backup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ spec:
serverHost: monitoring-service
serverUser: pmm
backup:
ttlSecondsAfterFinished: 3600
activeDeadlineSeconds: 3600
allowParallel: false
backoffLimit: 3
Expand Down
7 changes: 4 additions & 3 deletions pkg/apis/pxc/v1/pxc_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type PerconaXtraDBClusterSpec struct {
HAProxy *HAProxySpec `json:"haproxy,omitempty"`
PMM *PMMSpec `json:"pmm,omitempty"`
LogCollector *LogCollectorSpec `json:"logcollector,omitempty"`
Backup *PXCScheduledBackup `json:"backup,omitempty"`
Backup *BackupSpec `json:"backup,omitempty"`
UpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"`
UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"`
AllowUnsafeConfig bool `json:"allowUnsafeConfigurations,omitempty"`
Expand Down Expand Up @@ -218,7 +218,7 @@ const (
SmartUpdateStatefulSetStrategyType appsv1.StatefulSetUpdateStrategyType = "SmartUpdate"
)

type PXCScheduledBackup struct {
type BackupSpec struct {
AllowParallel *bool `json:"allowParallel,omitempty"`
Image string `json:"image,omitempty"`
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
Expand All @@ -232,13 +232,14 @@ type PXCScheduledBackup struct {
ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"`
StartingDeadlineSeconds *int64 `json:"startingDeadlineSeconds,omitempty"`
SuspendedDeadlineSeconds *int64 `json:"suspendedDeadlineSeconds,omitempty"`
TTLSecondsAfterFinished *int32 `json:"ttlSecondsAfterFinished,omitempty"`
// RunningDeadlineSeconds is the number of seconds to wait for the backup to transition to the 'Running' state.
// Once this threshold is reached, the backup will be marked as failed. Default is 300 seconds (5m).
// +kubebuilder:default:=300
RunningDeadlineSeconds *int64 `json:"runningDeadlineSeconds,omitempty"`
}

func (b *PXCScheduledBackup) GetAllowParallel() bool {
func (b *BackupSpec) GetAllowParallel() bool {
if b.AllowParallel == nil {
return true
}
Expand Down
169 changes: 87 additions & 82 deletions pkg/apis/pxc/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/controller/pxc/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ var _ = Describe("Backup reconciliation", Ordered, func() {
})

It("should create PerconaXtraDBCluster with backup configuration", func() {
cr.Spec.Backup = &api.PXCScheduledBackup{
cr.Spec.Backup = &api.BackupSpec{
Image: "backup-image",
Storages: map[string]*api.BackupStorageSpec{
"s3-us-west": {
Expand Down
Loading
Loading