Skip to content

Require At Least One Repo to be Configured #2662

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
merged 1 commit into from
Sep 8, 2021
Merged

Require At Least One Repo to be Configured #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,7 @@ spec:
required:
- name
type: object
minItems: 1
type: array
x-kubernetes-list-map-keys:
- name
Expand Down Expand Up @@ -2219,6 +2220,8 @@ spec:
- enabled
- repoName
type: object
required:
- repos
type: object
required:
- pgbackrest
Expand Down
1,012 changes: 506 additions & 506 deletions docs/content/references/crd.md
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions internal/controller/postgrescluster/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
Expand Down Expand Up @@ -820,6 +821,19 @@ func TestReconcileClusterPrimaryService(t *testing.T) {
cluster.Name = "pg8"
cluster.Spec.PostgresVersion = 12
cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{}}
cluster.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: v1.PersistentVolumeClaimSpec{
AccessModes: []v1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
Resources: v1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}}

assert.NilError(t, cc.Create(ctx, cluster))

Expand Down
16 changes: 16 additions & 0 deletions internal/controller/postgrescluster/controller_ref_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/rand"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -69,6 +70,21 @@ func TestManageControllerRefs(t *testing.T) {
Spec: v1beta1.PostgresClusterSpec{
PostgresVersion: 12,
InstanceSets: []v1beta1.PostgresInstanceSetSpec{{Name: "instance1"}},
Backups: v1beta1.Backups{PGBackRest: v1beta1.PGBackRestArchive{
Repos: []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: corev1.PersistentVolumeClaimSpec{
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}},
}},
},
}

Expand Down
29 changes: 29 additions & 0 deletions internal/controller/postgrescluster/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ func TestDeleteControlled(t *testing.T) {
instances: [{
name: instance,
}],
backups: {
pgbackrest: {
repos: [{
name: repo1,
}],
},
},
},
}`), cluster))

Expand Down Expand Up @@ -190,6 +197,17 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
`)
Expect(reconcile(cluster)).To(BeZero())
})
Expand Down Expand Up @@ -348,6 +366,17 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
`)
Expect(reconcile(cluster)).To(BeZero())

Expand Down
28 changes: 28 additions & 0 deletions internal/controller/postgrescluster/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,26 @@ func TestReconcilerHandleDelete(t *testing.T) {
},
},
],
backups: {
pgbackrest: {
repos: [{
name: repo1,
volume: {
volumeClaimSpec: {
accessModes: [ReadWriteOnce],
resources: { requests: { storage: 1Gi } },
},
},
}],
},
},
},
}`), cluster))

cluster.Namespace = ns.Name
cluster.Name = strings.ToLower(test.name)
cluster.Spec.Image = CrunchyPostgresHAImage
cluster.Spec.Backups.PGBackRest.Image = CrunchyPGBackRestImage

if test.beforeCreate != nil {
test.beforeCreate(t, cluster)
Expand Down Expand Up @@ -413,12 +427,26 @@ func TestReconcilerHandleDeleteNamespace(t *testing.T) {
},
},
],
backups: {
pgbackrest: {
repos: [{
name: repo1,
volume: {
volumeClaimSpec: {
accessModes: [ReadWriteOnce],
resources: { requests: { storage: 1Gi } },
},
},
}],
},
},
},
}`), cluster))

cluster.Namespace = ns.Name
cluster.Name = strings.ToLower("DeleteNamespace")
cluster.Spec.Image = CrunchyPostgresHAImage
cluster.Spec.Backups.PGBackRest.Image = CrunchyPGBackRestImage

assert.NilError(t, cc.Create(ctx, cluster))

Expand Down
14 changes: 14 additions & 0 deletions internal/controller/postgrescluster/patroni_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/rand"
Expand Down Expand Up @@ -168,6 +169,19 @@ func TestReconcilePatroniLeaderLease(t *testing.T) {
cluster.Name = "pg2"
cluster.Spec.PostgresVersion = 12
cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{}}
cluster.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: v1.PersistentVolumeClaimSpec{
AccessModes: []v1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
Resources: v1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}}

assert.NilError(t, cc.Create(ctx, cluster))

Expand Down
14 changes: 14 additions & 0 deletions internal/controller/postgrescluster/pgbouncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"gotest.tools/v3/assert"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/crunchydata/postgres-operator/internal/initialize"
Expand Down Expand Up @@ -185,6 +186,19 @@ func TestReconcilePGBouncerService(t *testing.T) {
cluster.Name = "pg2"
cluster.Spec.PostgresVersion = 12
cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{}}
cluster.Spec.Backups.PGBackRest.Repos = []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: corev1.PersistentVolumeClaimSpec{
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}}

assert.NilError(t, cc.Create(ctx, cluster))

Expand Down
31 changes: 31 additions & 0 deletions internal/controller/postgrescluster/pki_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/wait"

"gotest.tools/v3/assert"
Expand Down Expand Up @@ -80,6 +81,21 @@ func TestReconcileCerts(t *testing.T) {
InstanceSets: []v1beta1.PostgresInstanceSetSpec{{
Name: "instance",
}},
Backups: v1beta1.Backups{PGBackRest: v1beta1.PGBackRestArchive{
Repos: []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: v1.PersistentVolumeClaimSpec{
AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}},
}},
},
}
cluster1.SetGroupVersionKind(v1.SchemeGroupVersion.WithKind("postgrescluster"))
Expand All @@ -100,6 +116,21 @@ func TestReconcileCerts(t *testing.T) {
InstanceSets: []v1beta1.PostgresInstanceSetSpec{{
Name: "instance",
}},
Backups: v1beta1.Backups{PGBackRest: v1beta1.PGBackRestArchive{
Repos: []v1beta1.PGBackRestRepo{{
Name: "repo1",
Volume: &v1beta1.RepoPVC{
VolumeClaimSpec: v1.PersistentVolumeClaimSpec{
AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
},
}},
}},
},
}
cluster2.SetGroupVersionKind(v1.SchemeGroupVersion.WithKind("postgrescluster"))
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ type PGBackRestArchive struct {
Image string `json:"image,omitempty"`

// Defines a pgBackRest repository
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinItems=1
// +listType=map
// +listMapKey=name
Repos []PGBackRestRepo `json:"repos,omitempty"`
Repos []PGBackRestRepo `json:"repos"`

// Defines configuration for a pgBackRest dedicated repository host. This section is only
// applicable if at least one "volume" (i.e. PVC-based) repository is defined in the "repos"
Expand Down
6 changes: 4 additions & 2 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ metadata:
creationTimestamp: null
spec:
backups:
pgbackrest: {}
pgbackrest:
repos: null
instances: null
patroni:
dynamicConfiguration: null
Expand Down Expand Up @@ -81,7 +82,8 @@ metadata:
creationTimestamp: null
spec:
backups:
pgbackrest: {}
pgbackrest:
repos: null
instances:
- dataVolumeClaimSpec:
resources: {}
Expand Down