mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 06:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename CSI variables to be more descriptive

Browse Source 
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
Nolan Brubaker
2020-04-17 16:05:29 -04:00
parent b567859655
commit eefd12b3e4
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/controller/backup_controller.go
View File

@@ -639,7 +639,7 @@ func persistBackup(backup *pkgbackup.Request,
backupStore persistence.BackupStore,
log logrus.FieldLogger,
csiVolumeSnapshots []*snapshotv1beta1api.VolumeSnapshot,
volumeSnapshotContents []*snapshotv1beta1api.VolumeSnapshotContent,
csiVolumeSnapshotContents []*snapshotv1beta1api.VolumeSnapshotContent,
) []error {
errs := []error{}
backupJSON := new(bytes.Buffer)
@@ -664,7 +664,7 @@ func persistBackup(backup *pkgbackup.Request,
errs = append(errs, err)
}
snapshotContentsJSON, err := encodeToJSONGzip(volumeSnapshotContents, "volume snapshot contents list")
csiSnapshotContentsJSON, err := encodeToJSONGzip(csiVolumeSnapshotContents, "csi volume snapshot contents list")
if err != nil {
errs = append(errs, err)
}
@@ -681,19 +681,19 @@ func persistBackup(backup *pkgbackup.Request,
nativeVolumeSnapshots = nil
backupResourceList = nil
csiSnapshotJSON = nil
snapshotContentsJSON = nil
csiSnapshotContentsJSON = nil
}
backupInfo := persistence.BackupInfo{
Name: backup.Name,
Metadata: backupJSON,
Contents: backupContents,
Log: backupLog,
PodVolumeBackups: podVolumeBackups,
VolumeSnapshots: nativeVolumeSnapshots,
BackupResourceList: backupResourceList,
CSIVolumeSnapshots: csiSnapshotJSON,
VolumeSnapshotContents: snapshotContentsJSON,
Name: backup.Name,
Metadata: backupJSON,
Contents: backupContents,
Log: backupLog,
PodVolumeBackups: podVolumeBackups,
VolumeSnapshots: nativeVolumeSnapshots,
BackupResourceList: backupResourceList,
CSIVolumeSnapshots: csiSnapshotJSON,
CSIVolumeSnapshotContents: csiSnapshotContentsJSON,
}
if err := backupStore.PutBackup(backupInfo); err != nil {
errs = append(errs, err)

12
pkg/persistence/object_store.go
View File

@@ -43,7 +43,7 @@ type BackupInfo struct {
VolumeSnapshots,
BackupResourceList,
CSIVolumeSnapshots,
VolumeSnapshotContents io.Reader
CSIVolumeSnapshotContents io.Reader
}
// BackupStore defines operations for creating, retrieving, and deleting
@@ -221,11 +221,11 @@ func (s *objectBackupStore) PutBackup(info BackupInfo) error {
// Since the logic for all of these files is the exact same except for the name and the contents,
// use a map literal to iterate through them and write them to the bucket.
var backupObjs = map[string]io.Reader{
s.layout.getPodVolumeBackupsKey(info.Name): info.PodVolumeBackups,
s.layout.getBackupVolumeSnapshotsKey(info.Name): info.VolumeSnapshots,
s.layout.getBackupResourceListKey(info.Name): info.BackupResourceList,
s.layout.getCSIVolumeSnapshotKey(info.Name): info.CSIVolumeSnapshots,
s.layout.getVolumeSnapshotContentsKey(info.Name): info.VolumeSnapshotContents,
s.layout.getPodVolumeBackupsKey(info.Name): info.PodVolumeBackups,
s.layout.getBackupVolumeSnapshotsKey(info.Name): info.VolumeSnapshots,
s.layout.getBackupResourceListKey(info.Name): info.BackupResourceList,
s.layout.getCSIVolumeSnapshotKey(info.Name): info.CSIVolumeSnapshots,
s.layout.getCSIVolumeSnapshotContentsKey(info.Name): info.CSIVolumeSnapshotContents,
}
for key, reader := range backupObjs {

2
pkg/persistence/object_store_layout.go
View File

@@ -104,6 +104,6 @@ func (l *ObjectStoreLayout) getCSIVolumeSnapshotKey(backup string) string {
return path.Join(l.subdirs["backups"], backup, fmt.Sprintf("%s-csi-volumesnapshots.json.gz", backup))
}
func (l *ObjectStoreLayout) getVolumeSnapshotContentsKey(backup string) string {
func (l *ObjectStoreLayout) getCSIVolumeSnapshotContentsKey(backup string) string {
return path.Join(l.subdirs["backups"], backup, fmt.Sprintf("%s-csi-volumesnapshotcontents.json.gz", backup))
}