From 7913ae1867337e0160ccbcefa34a48ba5a779d5b Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Thu, 24 Jan 2019 09:55:55 -0700 Subject: [PATCH] remove extraneous use of meta.Accessor Signed-off-by: Steve Kriss --- pkg/backup/item_backupper.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/backup/item_backupper.go b/pkg/backup/item_backupper.go index 2d0363452..328e9df89 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -398,12 +398,7 @@ func (ib *defaultItemBackupper) takePVSnapshot(obj runtime.Unstructured, log log } } - metadata, err := meta.Accessor(obj) - if err != nil { - return errors.WithStack(err) - } - - pvFailureDomainZone := metadata.GetLabels()[zoneLabel] + pvFailureDomainZone := pv.Labels[zoneLabel] if pvFailureDomainZone == "" { log.Infof("label %q is not present on PersistentVolume", zoneLabel) } @@ -446,7 +441,7 @@ func (ib *defaultItemBackupper) takePVSnapshot(obj runtime.Unstructured, log log tags := map[string]string{ "velero.io/backup": ib.backupRequest.Name, - "velero.io/pv": metadata.GetName(), + "velero.io/pv": pv.Name, } log.Info("Getting volume information") @@ -457,7 +452,7 @@ func (ib *defaultItemBackupper) takePVSnapshot(obj runtime.Unstructured, log log } log.Info("Snapshotting PersistentVolume") - snapshot := volumeSnapshot(ib.backupRequest.Backup, metadata.GetName(), volumeID, volumeType, pvFailureDomainZone, location, iops) + snapshot := volumeSnapshot(ib.backupRequest.Backup, pv.Name, volumeID, volumeType, pvFailureDomainZone, location, iops) var errs []error snapshotID, err := blockStore.CreateSnapshot(snapshot.Spec.ProviderVolumeID, snapshot.Spec.VolumeAZ, tags)