remove code that removes legacy GC finalizer from backups

Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2019-04-15 10:17:03 -06:00
parent 892673816b
commit 7f36f78aee
3 changed files with 0 additions and 70 deletions
-7
View File
@@ -35,7 +35,6 @@ import (
listers "github.com/heptio/velero/pkg/generated/listers/velero/v1"
"github.com/heptio/velero/pkg/persistence"
"github.com/heptio/velero/pkg/plugin/clientmgmt"
"github.com/heptio/velero/pkg/util/stringslice"
)
type backupSyncController struct {
@@ -92,9 +91,6 @@ func NewBackupSyncController(
return c
}
// TODO(1.0): remove this
const gcFinalizer = "gc.ark.heptio.com"
func shouldSync(location *velerov1api.BackupStorageLocation, now time.Time, backupStore persistence.BackupStore, log logrus.FieldLogger) (bool, string) {
log = log.WithFields(map[string]interface{}{
"lastSyncedRevision": location.Status.LastSyncedRevision,
@@ -212,9 +208,6 @@ func (c *backupSyncController) run() {
continue
}
// remove the pre-v0.8.0 gcFinalizer if it exists
// TODO(1.0): remove this
backup.Finalizers = stringslice.Except(backup.Finalizers, gcFinalizer)
backup.Namespace = c.namespace
backup.ResourceVersion = ""
@@ -37,7 +37,6 @@ import (
persistencemocks "github.com/heptio/velero/pkg/persistence/mocks"
"github.com/heptio/velero/pkg/plugin/clientmgmt"
pluginmocks "github.com/heptio/velero/pkg/plugin/mocks"
"github.com/heptio/velero/pkg/util/stringslice"
velerotest "github.com/heptio/velero/pkg/util/test"
)
@@ -99,16 +98,6 @@ func TestBackupSyncControllerRun(t *testing.T) {
},
},
},
{
name: "gcFinalizer (only) gets removed on sync",
namespace: "ns-1",
locations: defaultLocationsList("ns-1"),
cloudBackups: map[string][]*velerov1api.Backup{
"bucket-1": {
velerotest.NewTestBackup().WithNamespace("ns-1").WithFinalizers("a-finalizer", gcFinalizer, "some-other-finalizer").Backup,
},
},
},
{
name: "all synced backups get created in Velero server's namespace",
namespace: "velero",
@@ -268,9 +257,6 @@ func TestBackupSyncControllerRun(t *testing.T) {
assert.Equal(t, expected, obj)
} else {
// verify that the GC finalizer is removed
assert.Equal(t, stringslice.Except(cloudBackup.Finalizers, gcFinalizer), obj.Finalizers)
// verify that the storage location field and label are set properly
assert.Equal(t, location.Name, obj.Spec.StorageLocation)
assert.Equal(t, location.Name, obj.Labels[velerov1api.StorageLocationLabel])