Added changes to fix nil dereferencing in PrepareResourceForApply.

Signed-off-by: Kesavan Thiruvenkadasamy <kthiruvenkadasamy@purestorage.com>

Author: px-kesavan

pkg/applicationmanager/controllers/applicationclone.go

@@ -536,6 +536,7 @@ func (a *ApplicationCloneController) prepareResources(
 				return nil, fmt.Errorf("error preparing PV resource %v: %v", metadata.GetName(), err)
 			}
 		}
+		var opts resourcecollector.Options
 		_, err = a.resourceCollector.PrepareResourceForApply(
 			o,
 			objects,
@@ -545,7 +546,7 @@ func (a *ApplicationCloneController) prepareResources(
 			pvNameMappings,
 			clone.Spec.IncludeOptionalResourceTypes,
 			nil,
-			nil,
+			&opts,
 		)
 		if err != nil {
 			return nil, err

pkg/applicationmanager/controllers/applicationrestore.go

@@ -605,6 +605,7 @@ func (a *ApplicationRestoreController) restoreVolumes(restore *storkapi.Applicat
 			if (driverName == "csi" || driverName == "kdmp") && restore.Spec.ReplacePolicy == storkapi.ApplicationRestoreReplacePolicyDelete {
 				objectMap := storkapi.CreateObjectsMap(restore.Spec.IncludeResources)
 				objectBasedOnIncludeResources := make([]runtime.Unstructured, 0)
+				var opts resourcecollector.Options
 				for _, o := range objects {
 					skip, err := a.resourceCollector.PrepareResourceForApply(
 						o,
@@ -615,7 +616,7 @@ func (a *ApplicationRestoreController) restoreVolumes(restore *storkapi.Applicat
 						nil,
 						restore.Spec.IncludeOptionalResourceTypes,
 						nil,
-						nil,
+						&opts,
 					)
 					if err != nil {
 						return err