Adjust Velero to custom needs #2

johannesfrey · 2021-04-14T14:09:43Z

Please add a summary of your change

This PR disables certain features and plugins (restic, hooks) as well as enables the possibilty to backup and restore remote clusters. More precisely, velero server may run on a different cluster than the one where the backups and restores are performed. Furthermore, with this PR, Velero-specific CRs are allowed to reside in a different namespace than the Velero server.
Even though it already works, the adjustments are pretty hacky. Those should be cleaned up in a separate PR.

PR is planned to be merged on monday April 26th 🙂

Does your change fix a particular issue?

Fixes #(issue)

Please indicate you've done the following:

Accepted the DCO. Commits without the DCO will delay acceptance.
Created a changelog file or added /kind changelog-not-required.
Updated the corresponding documentation in site/content/docs/main.

With this being enabled Velero won't backup CRs with version v1beta1

Otherwise a Restore will try to restore PodVolumeBackup CRDs, which do not exist for Pods in customer clusters.

pkg/backup/backup.go

pkg/backup/item_backupper.go

pkg/client/factory.go

pkg/cmd/server/plugin/plugin.go

pkg/cmd/server/server.go

pkg/controller/backup_controller.go

pkg/controller/backup_sync_controller.go

pkg/controller/restore_controller.go

pkg/restore/restore.go

pkg/cmd/server/server.go

pkg/controller/backup_controller.go

pkg/controller/backup_sync_controller.go

pkg/controller/restore_controller.go

pkg/restore/restore.go

sbueringer

/approve

johannesfrey · 2021-04-26T08:23:47Z

pkg/cmd/server/plugin/plugin.go

-				RegisterBackupItemAction("velero.io/crd-remap-version", newRemapCRDVersionAction(f)).
+				// We disable the crd-remap-version plugin because otherwise CRDs with version v1beta1 won't get backed
+				// up properly.
+				//RegisterBackupItemAction("velero.io/crd-remap-version", newRemapCRDVersionAction(f)).


FYI: This will be reverted with an upcoming commit.

See: b3f2aa6

pkg/backup/backup.go

pkg/cmd/server/server.go

pkg/controller/restore_controller_test.go

pkg/util/kube/cluster.go

chrischdi

/lgtm

pkg/backup/backup.go

pkg/controller/restore_controller.go

tobiasgiese

/lgtm
/approve

A few nits discussed via direct message, f.e. opt-in/out parameter for hooks and s.initRestic().
But these features are out-of-scope, as we want to have less diff to upstream

pkg/backup/remap_crd_version_action.go

* Disable CRD remap version plugin With this being enabled Velero won't backup CRs with version v1beta1 * Disable restic plugin Otherwise a Restore will try to restore PodVolumeBackup CRDs, which do not exist for Pods in customer clusters. * Disable hooks * Adjust server to cope with CRs residing in other namespaces * Add util func to obtain clients for a remote clusters * Dynamically obtain clients in backup and restore * Reenable crd-remap plugin and use correct client to fetch the CRDs * Do not hardcode velero namespace Co-authored-by: Stefan Bueringer <sbueringer@gmail.com>

Johannes Frey added 3 commits April 14, 2021 15:04

Disable CRD remap version plugin

c128057

With this being enabled Velero won't backup CRs with version v1beta1

Disable restic plugin

bcacbb6

Otherwise a Restore will try to restore PodVolumeBackup CRDs, which do not exist for Pods in customer clusters.

Disable hooks

ce383ab

github-actions bot added the has-unit-tests label Apr 14, 2021

github-actions bot assigned johannesfrey Apr 14, 2021

johannesfrey mentioned this pull request Apr 14, 2021

[WIP] Adjust Velero to custom needs #1

Closed

johannesfrey changed the title ~~Adjust Velero to custom needs~~ [WIP] Adjust Velero to custom needs Apr 14, 2021

johannesfrey force-pushed the caas branch from c2c2624 to b760729 Compare April 19, 2021 08:33

Johannes Frey added 3 commits April 19, 2021 12:35

Adjust server to cope with CRs residing in other namespaces

4722fb1

Add util func to obtain clients for a remote clusters

2418227

Dynamically obtain clients in backup and restore

6296e13

johannesfrey force-pushed the caas branch from b760729 to 6296e13 Compare April 19, 2021 10:36

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/cmd/server/server.go Outdated Show resolved Hide resolved

sbueringer and others added 2 commits April 20, 2021 07:59

some fixes

822dad5

Comments and cleanup

34f0cbd

johannesfrey force-pushed the caas branch from 1dd8b75 to 34f0cbd Compare April 20, 2021 10:23

johannesfrey changed the title ~~[WIP] Adjust Velero to custom needs~~ Adjust Velero to custom needs Apr 20, 2021

johannesfrey changed the base branch from main to c445 April 20, 2021 11:40

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/cmd/server/server.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/cmd/server/server.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/controller/backup_controller.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/controller/backup_sync_controller.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/controller/restore_controller.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/controller/restore_controller.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/controller/restore_controller.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/restore/restore.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/restore/restore.go Outdated Show resolved Hide resolved

sbueringer reviewed Apr 20, 2021

View reviewed changes

pkg/restore/restore.go Show resolved Hide resolved

johannesfrey force-pushed the caas branch from ad5c5d8 to 8620198 Compare April 21, 2021 08:16

Further cleanup

6aab624

johannesfrey force-pushed the caas branch from 8620198 to 6aab624 Compare April 21, 2021 08:33

sbueringer approved these changes Apr 21, 2021

View reviewed changes

johannesfrey commented Apr 26, 2021

View reviewed changes

seanschneeweiss reviewed Apr 26, 2021

View reviewed changes

pkg/backup/backup.go Show resolved Hide resolved

pkg/cmd/server/server.go Show resolved Hide resolved

pkg/controller/restore_controller_test.go Show resolved Hide resolved

pkg/util/kube/cluster.go Show resolved Hide resolved

chrischdi reviewed Apr 26, 2021

View reviewed changes

pkg/backup/backup.go Show resolved Hide resolved

pkg/controller/restore_controller.go Show resolved Hide resolved

tobiasgiese approved these changes Apr 26, 2021

View reviewed changes

Reenable crd-remap plugin and use correct client to fetch the CRDs

b3f2aa6

johannesfrey force-pushed the caas branch from 7505550 to b3f2aa6 Compare April 26, 2021 13:27

seanschneeweiss approved these changes Apr 26, 2021

View reviewed changes

Typo

86d3d76

sbueringer reviewed Apr 26, 2021

View reviewed changes

pkg/backup/remap_crd_version_action.go Show resolved Hide resolved

sbueringer reviewed Apr 26, 2021

View reviewed changes

pkg/backup/remap_crd_version_action.go Show resolved Hide resolved

Add more comments

3328594

sbueringer approved these changes Apr 26, 2021

View reviewed changes

Johannes Frey added 2 commits April 28, 2021 09:26

Do not hardcode velero namespace

6e90211

fixup

63ac802

seanschneeweiss approved these changes Apr 28, 2021

View reviewed changes

chrischdi approved these changes Apr 28, 2021

View reviewed changes

johannesfrey merged commit bb7aea8 into c445 Apr 28, 2021

johannesfrey deleted the caas branch June 24, 2021 09:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adjust Velero to custom needs #2

Adjust Velero to custom needs #2

johannesfrey commented Apr 14, 2021 •

edited

Loading

sbueringer left a comment

johannesfrey Apr 26, 2021

johannesfrey Apr 26, 2021 •

edited

Loading

chrischdi left a comment

tobiasgiese left a comment

Adjust Velero to custom needs #2

Adjust Velero to custom needs #2

Conversation

johannesfrey commented Apr 14, 2021 • edited Loading

Please add a summary of your change

Does your change fix a particular issue?

Please indicate you've done the following:

sbueringer left a comment

Choose a reason for hiding this comment

johannesfrey Apr 26, 2021

Choose a reason for hiding this comment

johannesfrey Apr 26, 2021 • edited Loading

Choose a reason for hiding this comment

chrischdi left a comment

Choose a reason for hiding this comment

tobiasgiese left a comment

Choose a reason for hiding this comment

johannesfrey commented Apr 14, 2021 •

edited

Loading

johannesfrey Apr 26, 2021 •

edited

Loading