From 4e1b1f94572bc89f9a0104688d0fe9a98f56c089 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Tue, 6 Aug 2019 13:01:36 -0700 Subject: [PATCH] use Backup CR labels as tags for snapshots (#1729) * use Backup CR labels as tags for snapshots This allows users to define custom tags to be added to snapshots, by specifying custom labels on the Backup CR with the `velero backup create --labels` flag. Signed-off-by: Adnan Abdulhussein --- changelogs/unreleased/1729-prydonius | 1 + pkg/backup/item_backupper.go | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/1729-prydonius diff --git a/changelogs/unreleased/1729-prydonius b/changelogs/unreleased/1729-prydonius new file mode 100644 index 000000000..6ba027a01 --- /dev/null +++ b/changelogs/unreleased/1729-prydonius @@ -0,0 +1 @@ +adds the ability to define custom tags to be added to snapshots by specifying custom labels on the Backup CR with the velero backup create --labels flag diff --git a/pkg/backup/item_backupper.go b/pkg/backup/item_backupper.go index 00abca956..f15435401 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -435,10 +435,12 @@ func (ib *defaultItemBackupper) takePVSnapshot(obj runtime.Unstructured, log log log = log.WithField("volumeID", volumeID) - tags := map[string]string{ - "velero.io/backup": ib.backupRequest.Name, - "velero.io/pv": pv.Name, + tags := ib.backupRequest.GetLabels() + if tags == nil { + tags = map[string]string{} } + tags["velero.io/backup"] = ib.backupRequest.Name + tags["velero.io/pv"] = pv.Name log.Info("Getting volume information") volumeType, iops, err := volumeSnapshotter.GetVolumeInfo(volumeID, pvFailureDomainZone)