Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5870,7 +5870,6 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -7091,6 +7090,11 @@ spec:
description: Enable tracking latest restorable time
type: boolean
type: object
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
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 5 additions & 1 deletion config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6275,7 +6275,6 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -7496,6 +7495,11 @@ spec:
description: Enable tracking latest restorable time
type: boolean
type: object
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
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 5 additions & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6572,7 +6572,6 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -7793,6 +7792,11 @@ spec:
description: Enable tracking latest restorable time
type: boolean
type: object
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
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 5 additions & 1 deletion deploy/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6572,7 +6572,6 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -7793,6 +7792,11 @@ spec:
description: Enable tracking latest restorable time
type: boolean
type: object
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
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
6 changes: 5 additions & 1 deletion deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6572,7 +6572,6 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -7793,6 +7792,11 @@ spec:
description: Enable tracking latest restorable time
type: boolean
type: object
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
crVersion:
description: |-
Version of the operator. Update this to new version after operator
Expand Down
80 changes: 80 additions & 0 deletions percona/controller/pgcluster/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2353,6 +2353,86 @@ var _ = Describe("CR Validations", Ordered, func() {
})
})
})

Context("Backup repository validations", Ordered, func() {
When("creating a CR with valid backup configurations", func() {
It("should accept backups disabled with no repositories", func() {
cr, err := readDefaultCR("cr-validation-backup-1", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &f
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{}

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

It("should accept backups enabled with at least one repository", func() {
cr, err := readDefaultCR("cr-validation-backup-2", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &t
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{
{Name: "repo1"},
}

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

It("should accept backups disabled with at least one repository", func() {
cr, err := readDefaultCR("cr-validation-backup-3", ns)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &f
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{
{Name: "repo1"},
}

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

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

cr.Spec.Backups.Enabled = nil // defaults to enabled
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{
{Name: "repo1"},
}

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)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = &t
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{}

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)
Expect(err).NotTo(HaveOccurred())

cr.Spec.Backups.Enabled = nil // defaults to enabled
cr.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{}

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",
))
})
})
})
})

var _ = Describe("Init Container", Ordered, func() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,8 @@ type Patroni struct {
Version string `json:"version"`
}

// 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"
type Backups struct {
Enabled *bool `json:"enabled,omitempty"`

Expand Down Expand Up @@ -562,7 +564,6 @@ type PGBackRestArchive struct {
Jobs *crunchyv1beta1.BackupJobs `json:"jobs,omitempty"`

// Defines a pgBackRest repository
// +kubebuilder:validation:MinItems=1
// +listType=map
// +listMapKey=name
Repos []crunchyv1beta1.PGBackRestRepo `json:"repos"`
Expand Down
Loading