Changes to support velero 1.10 #500

deepakkinni · 2022-11-23T20:05:39Z

What this PR does / why we need it:
Changes to support velero 1.10

Updated to go 1.18

Testing
Build/Unit

make push:

harbor-repo.vmware.com/velero/data-manager-for-plugin:vel_1_10_v1-c8d90ee-08.Dec.2022.11.49.13
harbor-repo.vmware.com/velero/velero-plugin-for-vsphere:vel_1_10_v1-c8d90ee-08.Dec.2022.11.49.13
harbor-repo.vmware.com/velero/backup-driver:vel_1_10_v1-c8d90ee-08.Dec.2022.11.49.13

make test:

Running tests: ./pkg/...
go test ./pkg/... -timeout=300s
Success!

Backup:

Without specifying default-volumes-to-fs-backup with annotation on the Pod

dkinni@dkinniCMD6R snapshot-vanilla-testing % velero backup create dec21bk4 --include-namespaces=foo --snapshot-volumes   
Backup request "dec21bk4" submitted successfully.
Run `velero backup describe dec21bk4` or `velero backup logs dec21bk4` for more details.

dkinni@dkinniCMD6R snapshot-vanilla-testing % velero backup describe dec21bk4                                          
Name:         dec21bk4
Namespace:    velero
Labels:       velero.io/storage-location=default
Annotations:  velero.io/source-cluster-k8s-gitversion=v1.25.2
              velero.io/source-cluster-k8s-major-version=1
              velero.io/source-cluster-k8s-minor-version=25

Phase:  Completed


Logs:
time="2022-12-22T04:41:37Z" level=info msg="Executing custom action" backup=velero/dec21bk4 logSource="pkg/backup/item_backupper.go:321" name=example-vanilla-block-pvc namespace=foo resource=persistentvolumeclaims
time="2022-12-22T04:41:37Z" level=info msg="Backing up resource persistentvolumeclaims: blocked = false" backup=velero/dec21bk4 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:54" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:41:37Z" level=info msg="VSphere PVCBackupItemAction for PVC foo/example-vanilla-block-pvc started. Storage Class Name: example-vanilla-block-sc" backup=velero/dec21bk4 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:70" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:41:37Z" level=info msg="Fetching underlying PV for PVC foo/example-vanilla-block-pvc" backup=velero/dec21bk4 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:96" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:41:37Z" level=info msg="Skipping PVC foo/example-vanilla-block-pvc, PV pvc-01490ccc-792a-4332-88b6-3f984581d609 will be backed up using fs backup" backup=velero/dec21bk4 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:109" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:41:37Z" level=info msg="VSphere PVCBackupItemAction for PVC foo/example-vanilla-block-pvc completed with err: <nil>" backup=velero/dec21bk4 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:73" pluginName=velero-plugin-for-vsphere

With specifying default-volumes-to-fs-backup and no annotation on the Pod

dkinni@dkinniCMD6R snapshot-vanilla-testing % velero backup create dec21bk5 --include-namespaces=foo --snapshot-volumes --default-volumes-to-fs-backup
Backup request "dec21bk5" submitted successfully.
Run `velero backup describe dec21bk5` or `velero backup logs dec21bk5` for more details.
dkinni@dkinniCMD6R snapshot-vanilla-testing % velero backup describe dec21bk5
Name:         dec21bk5
Namespace:    velero
Labels:       velero.io/storage-location=default
Annotations:  velero.io/source-cluster-k8s-gitversion=v1.25.2
              velero.io/source-cluster-k8s-major-version=1
              velero.io/source-cluster-k8s-minor-version=25

Phase:  Completed

Logs:
time="2022-12-22T04:46:13Z" level=info msg="Executing custom action" backup=velero/dec21bk5 logSource="pkg/backup/item_backupper.go:321" name=example-vanilla-block-pvc namespace=foo resource=persistentvolumeclaims
time="2022-12-22T04:46:13Z" level=info msg="Backing up resource persistentvolumeclaims: blocked = false" backup=velero/dec21bk5 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:54" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:46:13Z" level=info msg="VSphere PVCBackupItemAction for PVC foo/example-vanilla-block-pvc started. Storage Class Name: example-vanilla-block-sc" backup=velero/dec21bk5 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:70" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:46:13Z" level=info msg="Fetching underlying PV for PVC foo/example-vanilla-block-pvc" backup=velero/dec21bk5 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:96" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:46:13Z" level=info msg="Skipping PVC foo/example-vanilla-block-pvc, PV pvc-01490ccc-792a-4332-88b6-3f984581d609 will be backed up using fs backup" backup=velero/dec21bk5 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:109" pluginName=velero-plugin-for-vsphere
time="2022-12-22T04:46:13Z" level=info msg="VSphere PVCBackupItemAction for PVC foo/example-vanilla-block-pvc completed with err: <nil>" backup=velero/dec21bk5 cmd=/plugins/velero-plugin-for-vsphere logSource="/go/src/github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin/backup_pvc_action_plugin.go:73" pluginName=velero-plugin-for-vsphere

No annotation on the pod and without specifying default-volumes-to-fs-backup

This is regular backup, and works as expected.

Which issue(s) this PR fixes:
Fixes #485

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Changes to support velero v1.10

Signed-off-by: Deepak Kinni dkinni@vmware.com

pkg/builder/object_meta.go

go.mod

svcbot-qecnsdp · 2022-12-08T20:07:55Z

Sorry, some of the pre-check tests are failing for this PR !

Please check the Jenkins job for more details
https://container-dp.svc.eng.vmware.com/job/CNSDP-CI/772/

xinyanw409

Do we need to push vendor/ folder to the repo?

deepakkinni · 2022-12-08T20:24:53Z

Do we need to push vendor/ folder to the repo?

It was not a part of .gitignore in the past, so I assume it's expected.

xing-yang · 2022-12-10T00:27:59Z

Do we need to push vendor/ folder to the repo?

It was not a part of .gitignore in the past, so I assume it's expected.

We don't have a vendor folder. I don't think we should start having this in the github. Can you add /vendor to .gitignore?

deepakkinni · 2022-12-10T00:43:09Z

Do we need to push vendor/ folder to the repo?

It was not a part of .gitignore in the past, so I assume it's expected.

We don't have a vendor folder. I don't think we should start having this in the github. Can you add /vendor to .gitignore?

Fixed, removed the vendor, and added it as a part of gitignore.
cc: @xinyanw409

svcbot-qecnsdp · 2022-12-10T00:47:52Z

Sorry, some of the pre-check tests are failing for this PR !

Please check the Jenkins job for more details
https://container-dp.svc.eng.vmware.com/job/CNSDP-CI/773/

pkg/plugin/backup_pvc_action_plugin.go

xing-yang · 2022-12-19T14:01:11Z

Please also update the document:
https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#backup-vsphere-cns-file-volumes

Signed-off-by: Deepak Kinni <dkinni@vmware.com>

deepakkinni · 2022-12-22T04:54:57Z

Please also update the document: https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#backup-vsphere-cns-file-volumes

Done.

svcbot-qecnsdp · 2022-12-22T04:58:52Z

Sorry, some of the pre-check tests are failing for this PR !

Please check the Jenkins job for more details
https://container-dp.svc.eng.vmware.com/job/CNSDP-CI/775/

xing-yang · 2022-12-22T14:33:57Z

@deepakkinni With or without specifying default-volumes-to-fs-backup, the logs look identical. So what is the difference there? What does default-volumes-to-fs-backup do?

deepakkinni · 2022-12-22T20:02:01Z

@deepakkinni With or without specifying default-volumes-to-fs-backup, the logs look identical. So what is the difference there? What does default-volumes-to-fs-backup do?

From the plugin's perspective, the primary change is DefaultVolumesToRestic param is deprecated, and instead, users are supposed to specify DefaultVolumesToFsBackup/default-volumes-to-fs-backup.

The primary goal of the restic support is to ensure that specific volumes are skipped from backup. This is done by annotating the pod (https://velero.io/docs/v1.10/file-system-backup/#to-back-up).

When --default-volumes-to-fs-backup is False the plugin looks for backup.velero.io/backup-volumes annotation and skips them.

When --default-volumes-to-fs-backup is True, the plugin automatically assumes that all volumes attached to the pod are to be backed up by fs backup and hence are skipped.

xing-yang · 2022-12-22T20:14:05Z

Can you add one test:

Remove annotations + without default flag
Remove annotations + add the default flag

deepakkinni · 2022-12-22T20:26:19Z

Can you add one test:

* Remove annotations + without default flag

* Remove annotations + add the default flag

Clarified this in testing.

xing-yang

LGTM

Changes to support velero 1.10 Signed-off-by: Deepak Kinni <dkinni@vmware.com>

xing-yang reviewed Nov 23, 2022

View reviewed changes

pkg/builder/object_meta.go Show resolved Hide resolved

xing-yang reviewed Nov 28, 2022

View reviewed changes

go.mod Outdated Show resolved Hide resolved

deepakkinni force-pushed the vel_1_10_v1 branch from f02d641 to 231a5b1 Compare November 29, 2022 05:57

deepakkinni force-pushed the vel_1_10_v1 branch from 231a5b1 to c8d90ee Compare December 8, 2022 19:56

deepakkinni changed the title ~~[WIP]Changes to support velero 1.10~~ Changes to support velero 1.10 Dec 8, 2022

xinyanw409 reviewed Dec 8, 2022

View reviewed changes

deepakkinni force-pushed the vel_1_10_v1 branch from c8d90ee to 5c7d2fc Compare December 10, 2022 00:41

xing-yang reviewed Dec 10, 2022

View reviewed changes

pkg/plugin/backup_pvc_action_plugin.go Show resolved Hide resolved

Changes to support velero 1.10

48069a4

Signed-off-by: Deepak Kinni <dkinni@vmware.com>

deepakkinni force-pushed the vel_1_10_v1 branch from 5c7d2fc to 48069a4 Compare December 22, 2022 04:54

xing-yang approved these changes Dec 23, 2022

View reviewed changes

deepakkinni merged commit 61468e6 into vmware-tanzu:main Dec 23, 2022

lipingxue pushed a commit to lipingxue/velero-plugin-for-vsphere that referenced this pull request May 19, 2023

Changes to support velero 1.10 (vmware-tanzu#500)

303e01f

Changes to support velero 1.10 Signed-off-by: Deepak Kinni <dkinni@vmware.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to support velero 1.10 #500

Changes to support velero 1.10 #500

deepakkinni commented Nov 23, 2022 •

edited

Loading

svcbot-qecnsdp commented Dec 8, 2022

xinyanw409 left a comment

deepakkinni commented Dec 8, 2022

xing-yang commented Dec 10, 2022 •

edited

Loading

deepakkinni commented Dec 10, 2022

svcbot-qecnsdp commented Dec 10, 2022

xing-yang commented Dec 19, 2022

deepakkinni commented Dec 22, 2022

svcbot-qecnsdp commented Dec 22, 2022

xing-yang commented Dec 22, 2022

deepakkinni commented Dec 22, 2022

xing-yang commented Dec 22, 2022

deepakkinni commented Dec 22, 2022

xing-yang left a comment

Changes to support velero 1.10 #500

Changes to support velero 1.10 #500

Conversation

deepakkinni commented Nov 23, 2022 • edited Loading

svcbot-qecnsdp commented Dec 8, 2022

xinyanw409 left a comment

Choose a reason for hiding this comment

deepakkinni commented Dec 8, 2022

xing-yang commented Dec 10, 2022 • edited Loading

deepakkinni commented Dec 10, 2022

svcbot-qecnsdp commented Dec 10, 2022

xing-yang commented Dec 19, 2022

deepakkinni commented Dec 22, 2022

svcbot-qecnsdp commented Dec 22, 2022

xing-yang commented Dec 22, 2022

deepakkinni commented Dec 22, 2022

xing-yang commented Dec 22, 2022

deepakkinni commented Dec 22, 2022

xing-yang left a comment

Choose a reason for hiding this comment

deepakkinni commented Nov 23, 2022 •

edited

Loading

xing-yang commented Dec 10, 2022 •

edited

Loading