mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2025-12-23 06:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

issue 7214: data mover backup describe for legacy backups

Browse Source 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
Lyndon-Li
2023-12-18 11:07:01 +08:00
parent ea6c8ca127
commit 0313c2add0
4 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cmd/util/output/backup_describer.go
View File

@@ -445,6 +445,7 @@ func describeBackupVolumes(ctx context.Context, kbClient kbclient.Client, d *Des
nativeSnapshots := []*volume.VolumeInfo{}
csiSnapshots := []*volume.VolumeInfo{}
legacyInfoSource := false
buf := new(bytes.Buffer)
err := downloadrequest.Stream(ctx, kbClient, backup.Namespace, backup.Name, velerov1api.DownloadTargetKindBackupVolumeInfos, buf, downloadRequestTimeout, insecureSkipTLSVerify, caCertPath)
@@ -460,6 +461,8 @@ func describeBackupVolumes(ctx context.Context, kbClient kbclient.Client, d *Des
d.Printf("\t<error concluding CSI snapshot info: %v>\n", err)
return
}
legacyInfoSource = true
} else if err != nil {
d.Printf("\t<error getting backup volume info: %v>\n", err)
return
@@ -483,7 +486,7 @@ func describeBackupVolumes(ctx context.Context, kbClient kbclient.Client, d *Des
describeNativeSnapshots(d, details, nativeSnapshots)
d.Println()
describeCSISnapshots(d, details, csiSnapshots)
describeCSISnapshots(d, details, csiSnapshots, legacyInfoSource)
d.Println()
describePodVolumeBackups(d, details, podVolumeBackupCRs)
@@ -626,13 +629,17 @@ func describNativeSnapshot(d *Describer, details bool, info *volume.VolumeInfo)
}
}
func describeCSISnapshots(d *Describer, details bool, infos []*volume.VolumeInfo) {
func describeCSISnapshots(d *Describer, details bool, infos []*volume.VolumeInfo, legacyInfoSource bool) {
if !features.IsEnabled(velerov1api.CSIFeatureFlag) {
return
}
if len(infos) == 0 {
d.Printf("\tCSI Snapshots: <none included>\n")
if legacyInfoSource {
d.Printf("\tCSI Snapshots: <none included or not detectable>\n")
} else {
d.Printf("\tCSI Snapshots: <none included>\n")
}
return
}