Merge pull request #975 from skriss/rm-pvproviderexists

remove pvProviderExists param from NewRestoreController

pkg/controller/restore_controller.go

@@ -34,7 +34,6 @@ import (
 	"github.com/heptio/ark/pkg/persistence"
 	"github.com/heptio/ark/pkg/plugin"
 	"github.com/heptio/ark/pkg/restore"
-	"github.com/heptio/ark/pkg/util/boolptr"
 	"github.com/heptio/ark/pkg/util/collections"
 	kubeutil "github.com/heptio/ark/pkg/util/kube"
 	"github.com/heptio/ark/pkg/util/logging"
@@ -70,7 +69,6 @@ type restoreController struct {
 	restoreClient          arkv1client.RestoresGetter
 	backupClient           arkv1client.BackupsGetter
 	restorer               restore.Restorer
-	pvProviderExists       bool
 	backupLister           listers.BackupLister
 	restoreLister          listers.RestoreLister
 	backupLocationLister   listers.BackupStorageLocationLister
@@ -96,7 +94,6 @@ func NewRestoreController(
 	backupInformer informers.BackupInformer,
 	backupLocationInformer informers.BackupStorageLocationInformer,
 	snapshotLocationInformer informers.VolumeSnapshotLocationInformer,
-	pvProviderExists bool,
 	logger logrus.FieldLogger,
 	restoreLogLevel logrus.Level,
 	newPluginManager func(logrus.FieldLogger) plugin.Manager,
@@ -109,7 +106,6 @@ func NewRestoreController(
 		restoreClient:          restoreClient,
 		backupClient:           backupClient,
 		restorer:               restorer,
-		pvProviderExists:       pvProviderExists,
 		backupLister:           backupInformer.Lister(),
 		restoreLister:          restoreInformer.Lister(),
 		backupLocationLister:   backupLocationInformer.Lister(),
@@ -304,11 +300,6 @@ func (c *restoreController) validateAndComplete(restore *api.Restore, pluginMana
 		restore.Status.ValidationErrors = append(restore.Status.ValidationErrors, fmt.Sprintf("Invalid included/excluded namespace lists: %v", err))
 	}
 
-	// validate that PV provider exists if we're restoring PVs
-	if boolptr.IsSetToTrue(restore.Spec.RestorePVs) && !c.pvProviderExists {
-		restore.Status.ValidationErrors = append(restore.Status.ValidationErrors, "Server is not configured for PV snapshot restores")
-	}
-
 	// validate that exactly one of BackupName and ScheduleName have been specified
 	if !backupXorScheduleProvided(restore) {
 		restore.Status.ValidationErrors = append(restore.Status.ValidationErrors, "Either a backup or schedule must be specified as a source for the restore, but not both")