Fixing volume mount issue

Adding logic to ignore openshift & csi default plugins

Author: savitharaghunathan

controllers/velero.go

@@ -264,7 +264,6 @@ func (r *VeleroReconciler) ReconcileVeleroDeployment(log logr.Logger) (bool, err
 		if err != nil {
 			return err
 		}
-
 		// update the Deployment template
 		return r.buildVeleroDeployment(veleroDeployment, &velero)
 	})
@@ -531,3 +530,38 @@ func (r *VeleroReconciler) getVeleroResourceReqs(velero *oadpv1alpha1.Velero) co
 
 	return ResourcesReqs
 }
+
+// For later: Move this code into validator.go when more need for validation arises
+// TODO: if multiple default plugins exist, ensure we validate all of them.
+// Right now its sequential validation
+func (r *VeleroReconciler) ValidateVeleroDeployment(log logr.Logger) (bool, error) {
+	velero := oadpv1alpha1.Velero{}
+	if err := r.Get(r.Context, r.NamespacedName, &velero); err != nil {
+		return false, err
+	}
+
+	var secretName string
+	var defaultPlugin oadpv1alpha1.DefaultPlugin
+	for _, defaultPlugin = range velero.Spec.DefaultVeleroPlugins {
+		switch defaultPlugin {
+		case oadpv1alpha1.DefaultPluginAWS:
+			secretName = VeleroAWSSecretName
+		case oadpv1alpha1.DefaultPluginMicrosoftAzure:
+			secretName = VeleroAzureSecretName
+		case oadpv1alpha1.DefaultPluginGCP:
+			secretName = VeleroGCPSecretName
+
+		}
+
+		if defaultPlugin != oadpv1alpha1.DefaultPluginOpenShift && defaultPlugin != oadpv1alpha1.DefaultPluginCSI {
+			_, err := r.getProviderSecret(secretName)
+			if err != nil {
+				r.Log.Info(fmt.Sprintf("error validating %s provider secret:  %s/%s", defaultPlugin, r.NamespacedName.Namespace, secretName))
+				return false, err
+			}
+
+		}
+
+	}
+	return true, nil
+}

controllers/velero_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+
 	routev1 "github.com/openshift/api/route/v1"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 
@@ -73,13 +74,15 @@ func (r *VeleroReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	// Set reconciler context + name
 	r.Context = ctx
 	r.NamespacedName = req.NamespacedName
-
 	velero := oadpv1alpha1.Velero{}
+
 	if err := r.Get(ctx, req.NamespacedName, &velero); err != nil {
 		log.Error(err, "unable to fetch velero CR")
 		return result, client.IgnoreNotFound(err)
 	}
+
 	_, err := ReconcileBatch(r.Log,
+		r.ValidateVeleroDeployment,
 		r.ReconcileVeleroSecurityContextConstraint,
 		r.ReconcileResticRestoreHelperConfig,
 		r.ValidateBackupStorageLocations,
@@ -103,6 +106,7 @@ func (r *VeleroReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 				Message: err.Error(),
 			},
 		)
+
 	} else {
 		apimeta.SetStatusCondition(&velero.Status.Conditions,
 			metav1.Condition{