Skip to content

K8SPG-869 make repo field completely optional #1329

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

Merged
hors merged 2 commits into from
Oct 20, 2025
Merged

K8SPG-869 make repo field completely optional #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94fc9d6
K8SPG-869 make repo field completely optional
gkech Oct 20, 2025
2d8ba85
add unit test for enabled backups with nil repos - throw error
gkech Oct 20, 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
6 changes: 2 additions & 4 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7083,8 +7083,6 @@ spec:
type: object
type: object
type: object
required:
- repos
type: object
trackLatestRestorableTime:
description: Enable tracking latest restorable time
Expand All @@ -7093,8 +7091,8 @@ spec:
x-kubernetes-validations:
- message: At least one repository must be configured when backups
are enabled
rule: (has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos)
> 0
rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
&& size(self.pgbackrest.repos) > 0)
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 2 additions & 4 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7488,8 +7488,6 @@ spec:
type: object
type: object
type: object
required:
- repos
type: object
trackLatestRestorableTime:
description: Enable tracking latest restorable time
Expand All @@ -7498,8 +7496,8 @@ spec:
x-kubernetes-validations:
- message: At least one repository must be configured when backups
are enabled
rule: (has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos)
> 0
rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
&& size(self.pgbackrest.repos) > 0)
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 2 additions & 4 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7785,8 +7785,6 @@ spec:
type: object
type: object
type: object
required:
- repos
type: object
trackLatestRestorableTime:
description: Enable tracking latest restorable time
Expand All @@ -7795,8 +7793,8 @@ spec:
x-kubernetes-validations:
- message: At least one repository must be configured when backups
are enabled
rule: (has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos)
> 0
rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
&& size(self.pgbackrest.repos) > 0)
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 2 additions & 4 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7785,8 +7785,6 @@ spec:
type: object
type: object
type: object
required:
- repos
type: object
trackLatestRestorableTime:
description: Enable tracking latest restorable time
Expand All @@ -7795,8 +7793,8 @@ spec:
x-kubernetes-validations:
- message: At least one repository must be configured when backups
are enabled
rule: (has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos)
> 0
rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
&& size(self.pgbackrest.repos) > 0)
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 2 additions & 4 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7785,8 +7785,6 @@ spec:
type: object
type: object
type: object
required:
- repos
type: object
trackLatestRestorableTime:
description: Enable tracking latest restorable time
Expand All @@ -7795,8 +7793,8 @@ spec:
x-kubernetes-validations:
- message: At least one repository must be configured when backups
are enabled
rule: (has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos)
> 0
rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
&& size(self.pgbackrest.repos) > 0)
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
28 changes: 26 additions & 2 deletions percona/controller/pgcluster/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2401,11 +2401,21 @@ var _ = Describe("CR Validations", Ordered, func() {

Expect(k8sClient.Create(ctx, cr)).Should(Succeed())
})

It("should accept backups disabled with repositories not existing (nil)", func() {
cr, err := readDefaultCR("cr-validation-backup-5", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &f
cr.Spec.Backups.PGBackRest.Repos = nil

Expect(k8sClient.Create(ctx, cr)).Should(Succeed())
})
})

When("creating a CR with invalid backup configurations", func() {
It("should reject backups enabled with no repositories", func() {
cr, err := readDefaultCR("cr-validation-backup-5", ns)
cr, err := readDefaultCR("cr-validation-backup-1", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &t
Expand All @@ -2418,8 +2428,22 @@ var _ = Describe("CR Validations", Ordered, func() {
))
})

It("should reject backups enabled with no repositories (nil)", func() {
cr, err := readDefaultCR("cr-validation-backup-2", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &t
cr.Spec.Backups.PGBackRest.Repos = nil

err = k8sClient.Create(ctx, cr)
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring(
"At least one repository must be configured when backups are enabled",
))
})

It("should reject backups enabled (nil - default true) with no repositories", func() {
cr, err := readDefaultCR("cr-validation-backup-6", ns)
cr, err := readDefaultCR("cr-validation-backup-3", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = nil // defaults to enabled
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ type Patroni struct {
}

// Backups struct.
// +kubebuilder:validation:XValidation:rule="(has(self.enabled) && self.enabled == false) || size(self.pgbackrest.repos) > 0",message="At least one repository must be configured when backups are enabled"
// +kubebuilder:validation:XValidation:rule="(has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos) && size(self.pgbackrest.repos) > 0)",message="At least one repository must be configured when backups are enabled"
type Backups struct {
Enabled *bool `json:"enabled,omitempty"`

Expand Down Expand Up @@ -566,6 +566,7 @@ type PGBackRestArchive struct {
// Defines a pgBackRest repository
// +listType=map
// +listMapKey=name
// +optional
Repos []crunchyv1beta1.PGBackRestRepo `json:"repos"`

// Defines configuration for a pgBackRest dedicated repository host. This section is only
Expand Down
Loading