Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor backup snapshot status updates into UpdateBackupSnapshotsSta…
…tus() and run in backup_finalizer_controller Signed-off-by: Tiger Kaovilai <[email protected]>
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Update and wait for Backup.Status.CSIVolumeSnapshotsCompleted during finalize |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package backup | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" | ||
| snapshotv1listers "github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1" | ||
| "github.com/sirupsen/logrus" | ||
| "k8s.io/apimachinery/pkg/util/sets" | ||
| kbclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" | ||
| "github.com/vmware-tanzu/velero/pkg/label" | ||
| "github.com/vmware-tanzu/velero/pkg/util/boolptr" | ||
| ) | ||
|
|
||
| // Common function to update the status of CSI snapshots | ||
| // returns VolumeSnapshot, VolumeSnapshotContent, VolumeSnapshotClasses referenced | ||
| func UpdateBackupCSISnapshotsStatus(client kbclient.Client, volumeSnapshotLister snapshotv1listers.VolumeSnapshotLister, backup *velerov1api.Backup, backupLog logrus.FieldLogger) ([]snapshotv1api.VolumeSnapshot, []snapshotv1api.VolumeSnapshotContent, []snapshotv1api.VolumeSnapshotClass) { | ||
| var volumeSnapshots []snapshotv1api.VolumeSnapshot | ||
| var volumeSnapshotContents []snapshotv1api.VolumeSnapshotContent | ||
| var volumeSnapshotClasses []snapshotv1api.VolumeSnapshotClass | ||
| selector := label.NewSelectorForBackup(backup.Name) | ||
| vscList := &snapshotv1api.VolumeSnapshotContentList{} | ||
|
|
||
| if volumeSnapshotLister != nil { | ||
| tmpVSs, err := volumeSnapshotLister.List(label.NewSelectorForBackup(backup.Name)) | ||
| if err != nil { | ||
| backupLog.Error(err) | ||
| } | ||
| for _, vs := range tmpVSs { | ||
| volumeSnapshots = append(volumeSnapshots, *vs) | ||
| } | ||
| } | ||
|
|
||
| err := client.List(context.Background(), vscList, &kbclient.ListOptions{LabelSelector: selector}) | ||
| if err != nil { | ||
| backupLog.Error(err) | ||
| } | ||
| if len(vscList.Items) >= 0 { | ||
| volumeSnapshotContents = vscList.Items | ||
| } | ||
|
|
||
| vsClassSet := sets.NewString() | ||
| for index := range volumeSnapshotContents { | ||
| // persist the volumesnapshotclasses referenced by vsc | ||
| if volumeSnapshotContents[index].Spec.VolumeSnapshotClassName != nil && !vsClassSet.Has(*volumeSnapshotContents[index].Spec.VolumeSnapshotClassName) { | ||
| vsClass := &snapshotv1api.VolumeSnapshotClass{} | ||
| if err := client.Get(context.TODO(), kbclient.ObjectKey{Name: *volumeSnapshotContents[index].Spec.VolumeSnapshotClassName}, vsClass); err != nil { | ||
| backupLog.Error(err) | ||
| } else { | ||
| vsClassSet.Insert(*volumeSnapshotContents[index].Spec.VolumeSnapshotClassName) | ||
| volumeSnapshotClasses = append(volumeSnapshotClasses, *vsClass) | ||
| } | ||
| } | ||
| } | ||
| backup.Status.CSIVolumeSnapshotsAttempted = len(volumeSnapshots) | ||
| for _, vs := range volumeSnapshots { | ||
| if vs.Status != nil && boolptr.IsSetToTrue(vs.Status.ReadyToUse) { | ||
| backup.Status.CSIVolumeSnapshotsCompleted++ | ||
| } | ||
| } | ||
| return volumeSnapshots, volumeSnapshotContents, volumeSnapshotClasses | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package test | ||
|
|
||
| import ( | ||
| snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" | ||
| snapshotv1listers "github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| ) | ||
|
|
||
| // VolumeSnapshotLister helps list VolumeSnapshots. | ||
| // All objects returned here must be treated as read-only. | ||
| // | ||
| //go:generate mockery --name VolumeSnapshotLister | ||
| type VolumeSnapshotLister interface { | ||
| // List lists all VolumeSnapshots in the indexer. | ||
| // Objects returned here must be treated as read-only. | ||
| List(selector labels.Selector) (ret []*snapshotv1.VolumeSnapshot, err error) | ||
| // VolumeSnapshots returns an object that can list and get VolumeSnapshots. | ||
| VolumeSnapshots(namespace string) snapshotv1listers.VolumeSnapshotNamespaceLister | ||
| snapshotv1listers.VolumeSnapshotListerExpansion | ||
| } |
Oops, something went wrong.