Skip to content

Adding changes to Velero deployment suite to support BackupRestoreType #1

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
Nov 12, 2021
Merged

Adding changes to Velero deployment suite to support BackupRestoreType #1

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
7 changes: 0 additions & 7 deletions tests/e2e/backup_restore_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

type BackupRestoreType string

const (
csi BackupRestoreType = "csi"
restic BackupRestoreType = "restic"
)

type VerificationFunction func(client.Client, string) error

var _ = Describe("AWS backup restore tests", func() {
Expand Down
1 change: 0 additions & 1 deletion tests/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ var _ = BeforeSuite(func() {
vel.Name = testSuiteInstanceName

vel.SetClient()
//vel.Build()
Expect(doesNamespaceExist(namespace)).Should(BeTrue())
})

Expand Down
43 changes: 29 additions & 14 deletions tests/e2e/velero_deployment_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,20 @@ import (
var _ = Describe("Configuration testing for Velero Custom Resource", func() {

type InstallCase struct {
Name string
VeleroSpec *oadpv1alpha1.VeleroSpec
WantError bool
Name string
BRestoreType BackupRestoreType
VeleroSpec *oadpv1alpha1.VeleroSpec
WantError bool
}

DescribeTable("Updating custom resource with new configuration",
func(installCase InstallCase, expectedErr error) {
err := vel.CreateOrUpdate(installCase.VeleroSpec)
//TODO: Calling vel.build() is the old pattern.
//Change it later to make sure all the spec values are passed for every test case,
// instead of assigning the values in advance to the Velero CR
err := vel.Build(installCase.BRestoreType)
Expect(err).NotTo(HaveOccurred())
err = vel.CreateOrUpdate(installCase.VeleroSpec)
Expect(err).ToNot(HaveOccurred())
log.Printf("Waiting for velero pod to be running")
Eventually(isVeleroPodRunning(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
Expand Down Expand Up @@ -79,7 +85,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {

},
Entry("Default velero CR", InstallCase{
Name: "default-cr",
Name: "default-cr",
BRestoreType: restic,
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{
Expand All @@ -105,7 +112,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Velero CR with bsl and vsl", InstallCase{
Name: "default-cr-bsl-vsl",
Name: "default-cr-bsl-vsl",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{
Expand Down Expand Up @@ -139,7 +147,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Velero CR with bsl and multiple vsl", InstallCase{
Name: "default-cr-bsl-vsl",
Name: "default-cr-bsl-vsl",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{
Expand Down Expand Up @@ -179,7 +188,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Velero CR with no bsl and multiple vsl", InstallCase{
Name: "default-cr-multiple-vsl",
Name: "default-cr-multiple-vsl",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
VolumeSnapshotLocations: []velero.VolumeSnapshotLocationSpec{
Expand All @@ -204,9 +214,10 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Default velero CR with restic disabled", InstallCase{
Name: "default-cr-no-restic",
Name: "default-cr-no-restic",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(false),
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{
{
Provider: provider,
Expand All @@ -230,7 +241,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Adding CSI plugin", InstallCase{
Name: "default-cr-csi",
Name: "default-cr-csi",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{
Expand All @@ -257,7 +269,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Set restic node selector", InstallCase{
Name: "default-cr-node-selector",
Name: "default-cr-node-selector",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
ResticNodeSelector: map[string]string{
Expand Down Expand Up @@ -287,7 +300,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("Enable tolerations", InstallCase{
Name: "default-cr-tolerations",
Name: "default-cr-tolerations",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
VeleroTolerations: []corev1.Toleration{
Expand Down Expand Up @@ -322,7 +336,8 @@ var _ = Describe("Configuration testing for Velero Custom Resource", func() {
WantError: false,
}, nil),
Entry("NoDefaultBackupLocation", InstallCase{
Name: "default-cr-node-selector",
Name: "default-cr-node-selector",
BRestoreType: "restic",
VeleroSpec: &oadpv1alpha1.VeleroSpec{
EnableRestic: pointer.Bool(true),
BackupStorageLocations: []velero.BackupStorageLocationSpec{},
Expand Down
7 changes: 7 additions & 0 deletions tests/e2e/velero_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/config"
)

type BackupRestoreType string

const (
csi BackupRestoreType = "csi"
restic BackupRestoreType = "restic"
)

type veleroCustomResource struct {
Name string
Namespace string
Expand Down