From 892673816b1bc4771439eaf6b5cf4c9c5189012d Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 27 Mar 2019 17:04:06 -0600 Subject: [PATCH] remove legacy restore label Signed-off-by: Steve Kriss --- pkg/apis/velero/v1/constants.go | 8 -------- pkg/restore/restore.go | 5 ----- 2 files changed, 13 deletions(-) diff --git a/pkg/apis/velero/v1/constants.go b/pkg/apis/velero/v1/constants.go index 135ef02b9..72a084ea4 100644 --- a/pkg/apis/velero/v1/constants.go +++ b/pkg/apis/velero/v1/constants.go @@ -29,14 +29,6 @@ const ( // files that store metadata about the backup, such as the backup version. MetadataDir = "metadata" - // RestoreLabelKey is the label key that's applied to all resources that - // are created during a restore. This is applied for ease of identification - // of restored resources. The value will be the restore's name. - // - // This label is DEPRECATED as of v0.10 and will be removed entirely as of - // v1.0 and replaced with RestoreNameLabel ("velero.io/restore-name"). - RestoreLabelKey = "velero-restore" - // ClusterScopedDir is the name of the directory containing cluster-scoped // resources within a Velero backup. ClusterScopedDir = "cluster" diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 4f9cd56ca..0e381594d 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -1115,11 +1115,6 @@ func addRestoreLabels(obj metav1.Object, restoreName, backupName string) { labels[api.BackupNameLabel] = backupName labels[api.RestoreNameLabel] = restoreName - // TODO(1.0): remove the below line, and remove the `RestoreLabelKey` - // constant from the API pkg, since it's been replaced with the - // namespaced label above. - labels[api.RestoreLabelKey] = restoreName - obj.SetLabels(labels) }