Merge pull request #46487 from sbeskin-redhat/OADP_512_Remove_grep_from_oc_exec_velero_examples

OADP-512 Remove grep from `oc exec .. velero` examples

Author: jeana-redhat

modules/migration-debugging-velero-resources.adoc

@@ -19,23 +19,15 @@ Use the `oc exec` command to run a Velero CLI command:
 
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero <backup_restore_cr> <command> <cr_name>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  <backup_restore_cr> <command> <cr_name>
 ----
 
 .Example
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero backup describe 0e44ae00-5dc3-11eb-9ca8-df7e5254778b-2d8ql
-----
-
-You can specify `velero-<pod> -n {namespace}` in place of `$(oc get pods -n {namespace} -o name | grep velero)`.
-
-.Example
-[source,terminal,subs="attributes+"]
-----
-$ oc exec velero-<pod> -n {namespace} -- ./velero backup describe 0e44ae00-5dc3-11eb-9ca8-df7e5254778b-2d8ql
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  backup describe 0e44ae00-5dc3-11eb-9ca8-df7e5254778b-2d8ql
 ----
 
 [discrete]
@@ -46,7 +38,8 @@ Use the `velero --help` option to list all Velero CLI commands:
 
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) -- ./velero --help
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  --help
 ----
 
 [discrete]
@@ -57,15 +50,15 @@ Use the `velero describe` command to retrieve a summary of warnings and errors a
 
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero <backup_restore_cr> describe <cr_name>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  <backup_restore_cr> describe <cr_name>
 ----
 
 .Example
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero backup describe 0e44ae00-5dc3-11eb-9ca8-df7e5254778b-2d8ql
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  backup describe 0e44ae00-5dc3-11eb-9ca8-df7e5254778b-2d8ql
 ----
 
 [discrete]
@@ -76,13 +69,13 @@ Use the `velero logs` command to retrieve the logs of a `Backup` or `Restore` CR
 
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero <backup_restore_cr> logs <cr_name>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  <backup_restore_cr> logs <cr_name>
 ----
 
 .Example
 [source,terminal,subs="attributes+"]
 ----
-$ oc exec $(oc get pods -n {namespace} -o name | grep velero) \
-  -- ./velero restore logs ccc7c2d0-6017-11eb-afab-85d0007f5a19-x4lbf
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  restore logs ccc7c2d0-6017-11eb-afab-85d0007f5a19-x4lbf
 ----

modules/migration-partial-failure-velero.adoc

@@ -47,7 +47,8 @@ status:
 +
 [source,yaml]
 ----
-$ oc exec $(oc get pods -n openshift-migration -o name | grep velero) -n openshift-migration -- ./velero restore describe <restore>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  restore describe <restore>
 ----
 +
 .Example output
@@ -67,7 +68,8 @@ Errors:
 +
 [source,yaml]
 ----
-$ oc exec $(oc get pods -n openshift-migration -o name | grep velero) -n openshift-migration -- ./velero restore logs <restore>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  restore logs <restore>
 ----
 +
 .Example output

modules/oadp-backup-restore-cr-issues.adoc

@@ -37,8 +37,8 @@ If a backup is interrupted, it cannot be resumed.
 +
 [source,terminal]
 ----
-$ oc exec $(oc get pods -n openshift-adp -o name | grep velero) \
-  -- ./velero backup describe <backup>
+$ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
+  backup describe <backup>
 ----
 
 . Delete the `Backup` CR: