Sync CSI API objects during backup sync (#2496)

* add changelog

Signed-off-by: Ashish Amarnath <ashisham@vmware.com>

* Sync CSI API volumesnapshotcontents during backup sync

Signed-off-by: Ashish Amarnath <ashisham@vmware.com>

pkg/controller/backup_sync_controller.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 the Velero contributors.
+Copyright 2017, 2020 the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,14 +20,17 @@ import (
 	"encoding/json"
 	"time"
 
+	snapshotterClientSet "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	kuberrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/kubernetes"
 
 	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
+	"github.com/vmware-tanzu/velero/pkg/features"
 	velerov1client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
 	velerov1listers "github.com/vmware-tanzu/velero/pkg/generated/listers/velero/v1"
 	"github.com/vmware-tanzu/velero/pkg/label"
@@ -42,6 +45,8 @@ type backupSyncController struct {
 	backupLocationClient        velerov1client.BackupStorageLocationsGetter
 	podVolumeBackupClient       velerov1client.PodVolumeBackupsGetter
 	backupLister                velerov1listers.BackupLister
+	csiSnapshotClient           *snapshotterClientSet.Clientset
+	kubeClient                  kubernetes.Interface
 	backupStorageLocationLister velerov1listers.BackupStorageLocationLister
 	namespace                   string
 	defaultBackupLocation       string
@@ -58,6 +63,8 @@ func NewBackupSyncController(
 	backupStorageLocationLister velerov1listers.BackupStorageLocationLister,
 	syncPeriod time.Duration,
 	namespace string,
+	csiSnapshotClient *snapshotterClientSet.Clientset,
+	kubeClient kubernetes.Interface,
 	defaultBackupLocation string,
 	newPluginManager func(logrus.FieldLogger) clientmgmt.Manager,
 	logger logrus.FieldLogger,
@@ -77,6 +84,8 @@ func NewBackupSyncController(
 		defaultBackupSyncPeriod:     syncPeriod,
 		backupLister:                backupLister,
 		backupStorageLocationLister: backupStorageLocationLister,
+		csiSnapshotClient:           csiSnapshotClient,
+		kubeClient:                  kubeClient,
 
 		// use variables to refer to these functions so they can be
 		// replaced with fakes for testing.
@@ -262,6 +271,34 @@ func (c *backupSyncController) run() {
 					log.Debug("Synced pod volume backup into cluster")
 				}
 			}
+
+			if features.IsEnabled(velerov1api.CSIFeatureFlag) {
+				// we are syncing these objects only to ensure that the storage snapshots are cleaned up
+				// on backup deletion or expiry.
+				log.Info("Syncing CSI volumesnapshotcontents in backup")
+				snapConts, err := backupStore.GetCSIVolumeSnapshotContents(backupName)
+				if err != nil {
+					log.WithError(errors.WithStack(err)).Error("Error getting CSI volumesnapshotcontents for this backup from backup store")
+					continue
+				}
+
+				log.Infof("Syncing %d CSI volumesnapshotcontents in backup", len(snapConts))
+				for _, snapCont := range snapConts {
+					// TODO: Reset ResourceVersion prior to persisting VolumeSnapshotContents
+					snapCont.ResourceVersion = ""
+					created, err := c.csiSnapshotClient.SnapshotV1beta1().VolumeSnapshotContents().Create(snapCont)
+					switch {
+					case err != nil && kuberrs.IsAlreadyExists(err):
+						log.Debugf("volumesnapshotcontent %s already exists in cluster", snapCont.Name)
+						continue
+					case err != nil && !kuberrs.IsAlreadyExists(err):
+						log.WithError(errors.WithStack(err)).Errorf("Error syncing volumesnapshotcontent %s into cluster", snapCont.Name)
+						continue
+					default:
+						log.Infof("Created CSI volumesnapshotcontent %s", created.Name)
+					}
+				}
+			}
 		}
 
 		c.deleteOrphanedBackups(location.Name, backupStoreBackups, log)