Remove VSB and VSR from OADP 1.3+ (#1212)

Since VSB and VSR is not needed in OADP 1.3+ removing it from the CSV.

Updated API_ref and script to not show errors. E.g. when the ocp is missing
those APIs, however left the functions in the datamover_resources.sh as one
may want to run it against earlier OADP versions.

config/manifests/bases/oadp-operator.clusterserviceversion.yaml

@@ -385,78 +385,6 @@ spec:
         displayName: StartTimestamp
         path: startTimestamp
       version: v2alpha1
-    - description: VolumeSnapshotBackup is the Schema for the volumesnapshotbackups
-        API
-      displayName: VolumeSnapshotBackup
-      kind: VolumeSnapshotBackup
-      name: volumesnapshotbackups.datamover.oadp.openshift.io
-      statusDescriptors:
-      - description: volumesnapshotbackup batching status
-        displayName: BatchingStatus
-        path: batchingStatus
-      - description: CompletionTimestamp records the time a volumesnapshotbackup reached
-          a terminal state.
-        displayName: CompletionTimestamp
-        path: completionTimestamp
-      - description: Include references to the Volsync CRs and their state as they
-          are running
-        displayName: Conditions
-        path: conditions
-      - description: volumesnapshot backup phase status
-        displayName: Phase
-        path: phase
-      - description: Includes information pertaining to Volsync ReplicationSource
-          CR
-        displayName: ReplicationSourceData
-        path: replicationSourceData
-      - description: Includes restic repository path
-        displayName: Resticrepository
-        path: resticrepository
-      - description: Includes source PVC name and size
-        displayName: SourcePVCData
-        path: sourcePVCData
-      - description: StartTimestamp records the time a volsumesnapshotbackup was started.
-        displayName: StartTimestamp
-        path: startTimestamp
-      - description: name of the VolumeSnapshotClass
-        displayName: VolumeSnapshotClassName
-        path: volumeSnapshotClassName
-      version: v1alpha1
-    - description: VolumeSnapshotRestore is the Schema for the volumesnapshotrestores
-        API
-      displayName: VolumeSnapshotRestore
-      kind: VolumeSnapshotRestore
-      name: volumesnapshotrestores.datamover.oadp.openshift.io
-      statusDescriptors:
-      - description: volumesnapshotrestore batching status
-        displayName: BatchingStatus
-        path: batchingStatus
-      - description: CompletionTimestamp records the time a volumesnapshotrestore
-          reached a terminal state.
-        displayName: CompletionTimestamp
-        path: completionTimestamp
-      - description: Include references to the Volsync CRs and their state as they
-          are running
-        displayName: Conditions
-        path: conditions
-      - description: volumesnapshot restore phase status
-        displayName: Phase
-        path: phase
-      - description: Includes information pertaining to Volsync ReplicationDestination
-          CR
-        displayName: ReplicationDestinationData
-        path: replicationDestinationData
-      - description: name of the volumesnapshot snaphandle that is backed up
-        displayName: SnapshotHandle
-        path: snapshotHandle
-      - description: StartTimestamp records the time a volsumesnapshotrestore was
-          started.
-        displayName: StartTimestamp
-        path: startTimestamp
-      - description: name of the volumesnapshotcontent that is backed up
-        displayName: VolumeSnapshotContentName
-        path: volumeSnapshotContentName
-      version: v1alpha1
     - description: The CloudStorage API automates the creation of a bucket for object
         storage.
       displayName: CloudStorage

docs/API_ref.md

@@ -6,8 +6,6 @@ Run `oc api-resources | grep -e 'oadp\|velero'` to get available APIs
 
 Example output (subject to change, depending on the version of OADP installed):
 ```
-volumesnapshotbackups                 vsb                 datamover.oadp.openshift.io/v1alpha1            true         VolumeSnapshotBackup
-volumesnapshotrestores                vsr                 datamover.oadp.openshift.io/v1alpha1            true         VolumeSnapshotRestore
 veleroinstalls                                            managed.openshift.io/v1alpha2                   true         VeleroInstall
 cloudstorages                                             oadp.openshift.io/v1alpha1                      true         CloudStorage
 dataprotectionapplications            dpa                 oadp.openshift.io/v1alpha1                      true         DataProtectionApplication

docs/examples/datamover_resources.sh

@@ -52,30 +52,30 @@ function backup_summary () {
     echo -e "Get Backups:\n"
     oc -n openshift-adp exec deployment/velero -c velero -it -- ./velero get backup ;
     echo -e "\nTotal Snapshots: " `oc get volumesnapshot -A | sed 1d | wc -l` ; 
-    echo "Total OADP Snapshots: " `oc get volumesnapshot -n openshift-adp | sed 1d | wc -l` ; 
+    echo "Total OADP Snapshots: " `oc get volumesnapshot -n openshift-adp | sed 1d | wc -l` ;
     echo "Total SnapshotContents: " `oc get volumesnapshotcontents -A | sed 1d | wc -l` ; 
-    echo -e "\nTotal VSB: " `oc get vsb -A | sed 1d | wc -l` ; 
-    echo "Completed: " `oc get vsb -A | grep -c Completed` ; 
-    echo "InProgress: " `oc get vsb -A | grep -c InProgress` ; 
-    echo "SnapshotBackupDone: " `oc get vsb -A | grep -c SnapshotBackupDone` ; 
-    echo -e "\nVSB STATUS" ; 
-    echo "Completed: " `oc get vsb -A -oyaml | grep batching | grep -c Completed` ; 
-    echo "Processing: " `oc get vsb -A -oyaml | grep batching | grep -c Processing` ; 
-    echo "Queued: " `oc get vsb -A -oyaml | grep batching | grep -c Queued` ; 
+    echo -e "\nTotal VSB: " `oc get vsb -A 2>/dev/null | sed 1d | wc -l` ;
+    echo "Completed: " `oc get vsb -A 2>/dev/null | grep -c Completed` ;
+    echo "InProgress: " `oc get vsb -A 2>/dev/null | grep -c InProgress` ;
+    echo "SnapshotBackupDone: " `oc get vsb -A 2>/dev/null | grep -c SnapshotBackupDone` ;
+    echo -e "\nVSB STATUS" ;
+    echo "Completed: " `oc get vsb -A -oyaml 2>/dev/null | grep batching | grep -c Completed` ;
+    echo "Processing: " `oc get vsb -A -oyaml 2>/dev/null | grep batching | grep -c Processing` ;
+    echo "Queued: " `oc get vsb -A -oyaml 2>/dev/null | grep batching | grep -c Queued` ;
     echo -e "\nTotal ReplicationSources: " `oc get replicationsources -A | sed 1d | wc -l` ;
 }
 
 function restore_summary () {
     echo -e "Get Restores:\n"
-    oc -n openshift-adp exec deployment/velero -c velero -it -- ./velero get restore ; 
-    echo -e "\nTotal VSR: " `oc get vsr -A | sed 1d | wc -l` ; 
-    echo "Completed: " `oc get vsr -A | grep -c Completed` ; 
-    echo "InProgress: " `oc get vsr -A | grep -c InProgress` ; 
-    echo "SnapshotRestoreDone: " `oc get vsr -A | grep -c SnapshotRestoreDone` ; 
-    echo -e "\nVSR STATUS" ; 
-    echo "Completed: " `oc get vsr -A -oyaml | grep batching | grep -c Completed` ; 
-    echo "Processing: " `oc get vsr -A -oyaml | grep batching | grep -c Processing` ; 
-    echo "Queued: " `oc get vsr -A -oyaml | grep batching | grep -c Queued` ; 
+    oc -n openshift-adp exec deployment/velero -c velero -it -- ./velero get restore ;
+    echo -e "\nTotal VSR: " `oc get vsr -A 2>/dev/null | sed 1d | wc -l` ;
+    echo "Completed: " `oc get vsr -A 2>/dev/null | grep -c Completed` ;
+    echo "InProgress: " `oc get vsr -A 2>/dev/null | grep -c InProgress` ;
+    echo "SnapshotRestoreDone: " `oc get vsr -A 2>/dev/null | grep -c SnapshotRestoreDone` ;
+    echo -e "\nVSR STATUS" ;
+    echo "Completed: " `oc get vsr -A -oyaml 2>/dev/null | grep batching | grep -c Completed` ;
+    echo "Processing: " `oc get vsr -A -oyaml 2>/dev/null | grep batching | grep -c Processing` ;
+    echo "Queued: " `oc get vsr -A -oyaml 2>/dev/null | grep batching | grep -c Queued` ;
     echo -e "\nTotal ReplicationDestinations: " `oc get replicationdestinations -A | sed 1d | wc -l` ;
 }