Merge pull request #85615 from shdeshpa07/OADP-5268-Use-velero-io

jab-rh · web-flow · commit 00e853778968 · 2024-12-09T08:11:53.000-05:00
Rename oc commands to use velero.io
diff --git a/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc b/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc
@@ -32,7 +32,7 @@ You back up Kubernetes resources, internal images, and persistent volumes (PVs)
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocations -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 +
 .Example output
@@ -84,5 +84,5 @@ spec:
 +
 [source,terminal]
 ----
-$ oc get backup -n openshift-adp <backup> -o jsonpath='{.status.phase}'
+$ oc get backups.velero.io -n openshift-adp <backup> -o jsonpath='{.status.phase}'
 ----
diff --git a/cloud_experts_tutorials/cloud-experts-deploy-api-data-protection.adoc b/cloud_experts_tutorials/cloud-experts-deploy-api-data-protection.adoc
@@ -528,8 +528,8 @@ $ oc delete ns hello-world
 +
 [source,terminal]
 ----
-$ oc delete backup hello-world
-$ oc delete restore hello-world
+$ oc delete backups.velero.io hello-world
+$ oc delete restores.velero.io hello-world
 ----
 
 . To delete the backup/restore and remote objects in s3:
diff --git a/modules/backup-hosted-cluster-virt.adoc b/modules/backup-hosted-cluster-virt.adoc
@@ -82,7 +82,7 @@ Replace `<backup_file_name>` with the name of your file.
 +
 [source,terminal]
 ----
-$ watch "oc get backup -n openshift-adp <backup_file_name> -o jsonpath='{.status}' | jq"
+$ watch "oc get backups.velero.io -n openshift-adp <backup_file_name> -o jsonpath='{.status}' | jq"
 ----
 +
 ** To monitor the Velero logs, enter the following command:
diff --git a/modules/cleanup-a-backup-oadp-aws-sts.adoc b/modules/cleanup-a-backup-oadp-aws-sts.adoc
@@ -60,7 +60,7 @@ $ oc delete ns openshift-adp
 +
 [source,terminal]
 ----
-$ oc delete backup hello-world
+$ oc delete backups.velero.io hello-world
 ----
 
 . To delete backup, restore and remote objects in {aws-short} S3, run the following command:
diff --git a/modules/cleanup-a-backup-oadp-rosa-sts.adoc b/modules/cleanup-a-backup-oadp-rosa-sts.adoc
@@ -60,7 +60,7 @@ $ oc delete ns openshift-adp
 +
 [source,terminal]
 ----
-$ oc delete backup hello-world
+$ oc delete backups.velero.io hello-world
 ----
 
 . To delete backup, restore and remote objects in {aws-short} S3 run the following command:
diff --git a/modules/hcp-dr-oadp-backup-cp-workload.adoc b/modules/hcp-dr-oadp-backup-cp-workload.adoc
@@ -136,7 +136,7 @@ $ oc apply -f backup-control-plane.yaml
 +
 [source,terminal]
 ----
-$ oc get backup <backup_resource_name> -n openshift-adp -o jsonpath='{.status.phase}'
+$ oc get backups.velero.io <backup_resource_name> -n openshift-adp -o jsonpath='{.status.phase}'
 ----
 
 .Next steps
diff --git a/modules/hcp-dr-oadp-observe.adoc b/modules/hcp-dr-oadp-observe.adoc
@@ -14,14 +14,14 @@ When using {oadp-first} to backup and restore a hosted cluster, you can monitor
 +
 [source,terminal]
 ----
-$ watch "oc get backup -n openshift-adp <backup_resource_name> -o jsonpath='{.status}'"
+$ watch "oc get backups.velero.io -n openshift-adp <backup_resource_name> -o jsonpath='{.status}'"
 ----
 
 . Observe the restore process by running the following command:
 +
 [source,terminal]
 ----
-$ watch "oc get restore -n openshift-adp <backup_resource_name> -o jsonpath='{.status}'"
+$ watch "oc get restores.velero.io -n openshift-adp <backup_resource_name> -o jsonpath='{.status}'"
 ----
 
 . Observe the Velero logs by running the following command:
diff --git a/modules/oadp-backup-restore-cr-issues.adoc b/modules/oadp-backup-restore-cr-issues.adoc
@@ -45,7 +45,7 @@ $ oc -n {namespace} exec deployment/velero -c velero -- ./velero \
 +
 [source,terminal]
 ----
-$ oc delete backup <backup> -n openshift-adp
+$ oc delete backups.velero.io <backup> -n openshift-adp
 ----
 +
 You do not need to clean up the backup location because a `Backup` CR in progress has not uploaded files to object storage.
@@ -79,7 +79,7 @@ time="2023-02-17T16:33:13Z" level=error msg="Error backing up item" backup=opens
 +
 [source,terminal]
 ----
-$ oc delete backup <backup> -n openshift-adp
+$ oc delete backups.velero.io <backup> -n openshift-adp
 ----
 
 . If required, clean up the stored data on the `BackupStorageLocation` to free up space.
diff --git a/modules/oadp-creating-backup-cr.adoc b/modules/oadp-creating-backup-cr.adoc
@@ -27,7 +27,7 @@ To back up Kubernetes resources, internal images, and persistent volumes (PVs),
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocations -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 +
 .Example output
@@ -79,5 +79,5 @@ spec:
 +
 [source,terminal]
 ----
-$ oc get backup -n openshift-adp <backup> -o jsonpath='{.status.phase}'
+$ oc get backups.velero.io -n openshift-adp <backup> -o jsonpath='{.status.phase}'
 ----
diff --git a/modules/oadp-creating-restore-cr.adoc b/modules/oadp-creating-restore-cr.adoc
@@ -46,7 +46,7 @@ spec:
 +
 [source,terminal]
 ----
-$ oc get restore -n openshift-adp <restore> -o jsonpath='{.status.phase}'
+$ oc get restores.velero.io -n openshift-adp <restore> -o jsonpath='{.status.phase}'
 ----
 
 . Verify that the backup resources have been restored by entering the following command:
diff --git a/modules/oadp-features-plugins-known-issues.adoc b/modules/oadp-features-plugins-known-issues.adoc
@@ -33,7 +33,7 @@ To avoid the Velero plugin panic error, perform the following steps:
 +
 [source,terminal]
 ----
-$ oc label BackupStorageLocation <bsl_name> app.kubernetes.io/component=bsl
+$ oc label backupstoragelocations.velero.io <bsl_name> app.kubernetes.io/component=bsl
 ----
 
 . After the BSL is labeled, wait until the DPA reconciles.
diff --git a/modules/oadp-installing-dpa-1-2-and-earlier.adoc b/modules/oadp-installing-dpa-1-2-and-earlier.adoc
@@ -370,7 +370,7 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocation -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 +
 .Example output
diff --git a/modules/oadp-installing-dpa-1-3.adoc b/modules/oadp-installing-dpa-1-3.adoc
@@ -482,7 +482,7 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocation -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 .Example output
 +
diff --git a/modules/oadp-multiple-bsl-use-case.adoc b/modules/oadp-multiple-bsl-use-case.adoc
@@ -153,7 +153,7 @@ $ oc apply -f <backup_file_name> # <1>
 +
 [source,terminal]
 ----
-$ oc get backup <backup_name> -o yaml # <1>
+$ oc get backups.velero.io <backup_name> -o yaml # <1>
 ----
 <1> Specify the name of the backup.
 
@@ -189,6 +189,6 @@ $ oc apply -f <backup_file_name> # <1>
 +
 [source, terminal]
 ----
-$ oc get backup <backup_name> -o yaml # <1>
+$ oc get backups.velero.io <backup_name> -o yaml # <1>
 ----
 <1> Specify the name of the backup.
diff --git a/modules/oadp-operator-issues.adoc b/modules/oadp-operator-issues.adoc
@@ -29,7 +29,7 @@ Retrieve a list of backup storage locations (BSLs) and check the manifest of eac
 +
 [source,terminal]
 ----
-$ oc get backupstoragelocation -A
+$ oc get backupstoragelocations.velero.io -A
 ----
 
 .. Using the Velero CLI:
@@ -43,7 +43,7 @@ $ velero backup-location get -n <OADP_Operator_namespace>
 +
 [source,terminal]
 ----
-$ oc get backupstoragelocation -n <namespace> -o yaml
+$ oc get backupstoragelocations.velero.io -n <namespace> -o yaml
 ----
 
 .Example result
diff --git a/modules/oadp-usecase-backup-odf.adoc b/modules/oadp-usecase-backup-odf.adoc
@@ -200,7 +200,7 @@ metadata:
 +
 [source,terminal]
 ----
-$ oc get bsl -n openshift-adp 
+$ oc get backupstoragelocations.velero.io -n openshift-adp 
 ----
 +
 .Example output
diff --git a/modules/oadp-usecase-include-ca-cert-backup.adoc b/modules/oadp-usecase-include-ca-cert-backup.adoc
@@ -211,7 +211,7 @@ metadata:
 +
 [source,terminal]
 ----
-$ oc get bsl -n openshift-adp 
+$ oc get backupstoragelocations.velero.io -n openshift-adp 
 ----
 +
 .Example output
diff --git a/modules/oadp-usecase-kopia-override-algorithms.adoc b/modules/oadp-usecase-kopia-override-algorithms.adoc
@@ -115,7 +115,7 @@ $ oc apply -f <backup_file_name> # <1>
 +
 [source,terminal]
 ----
-$ oc get backup <backup_name> -o yaml # <1>
+$ oc get backups.velero.io <backup_name> -o yaml # <1>
 ----
 <1> Specify the name of the backup.
 
diff --git a/modules/oadp-usecase-restore.adoc b/modules/oadp-usecase-restore.adoc
@@ -48,7 +48,7 @@ $ oc apply -f <restore_cr_filename>
 +
 [source,terminal]
 ----
-$ oc describe restore <restore_name> -n openshift-adp 
+$ oc describe restores.velero.io <restore_name> -n openshift-adp 
 ----
 
 . Change to the restored namespace `test-restore-application` by running the following command:
diff --git a/modules/oadp-verifying-upgrade-1-3-0.adoc b/modules/oadp-verifying-upgrade-1-3-0.adoc
@@ -62,7 +62,7 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocation -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 .Example output
 [source,yaml]
diff --git a/modules/oadp-verifying-upgrade-1-4-0.adoc b/modules/oadp-verifying-upgrade-1-4-0.adoc
@@ -62,7 +62,7 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
 +
 [source,terminal]
 ----
-$ oc get backupStorageLocation -n openshift-adp
+$ oc get backupstoragelocations.velero.io -n openshift-adp
 ----
 .Example output
 [source,yaml]
diff --git a/modules/restore-hosted-cluster-virt.adoc b/modules/restore-hosted-cluster-virt.adoc
@@ -63,7 +63,7 @@ Replace `<restore_resource_file_name>` with the name of your file.
 +
 [source,terminal]
 ----
-$ watch "oc get restore -n openshift-adp <backup_file_name> -o jsonpath='{.status}' | jq"
+$ watch "oc get restores.velero.io -n openshift-adp <backup_file_name> -o jsonpath='{.status}' | jq"
 ----
 +
 ** To check the Velero logs, enter the following command:

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ You back up Kubernetes resources, internal images, and persistent volumes (PVs)`
`32`	`32`	`+`
`33`	`33`	`[source,terminal]`
`34`	`34`	`----`
`35`		`-$ oc get backupStorageLocations -n openshift-adp`
	`35`	`+$ oc get backupstoragelocations.velero.io -n openshift-adp`
`36`	`36`	`----`
`37`	`37`	`+`
`38`	`38`	`.Example output`
`@@ -84,5 +84,5 @@ spec:`
`84`	`84`	`+`
`85`	`85`	`[source,terminal]`
`86`	`86`	`----`
`87`		`-$ oc get backup -n openshift-adp <backup> -o jsonpath='{.status.phase}'`
	`87`	`+$ oc get backups.velero.io -n openshift-adp <backup> -o jsonpath='{.status.phase}'`
`88`	`88`	`----`
Original file line number	Diff line number	Diff line change
@@ -82,7 +82,7 @@ Replace `<backup_file_name>` with the name of your file.
`82`	`82`	`+`
`83`	`83`	`[source,terminal]`
`84`	`84`	`----`
`85`		`-$ watch "oc get backup -n openshift-adp <backup_file_name> -o jsonpath='{.status}' \| jq"`
	`85`	`+$ watch "oc get backups.velero.io -n openshift-adp <backup_file_name> -o jsonpath='{.status}' \| jq"`
`86`	`86`	`----`
`87`	`87`	`+`
`88`	`88`	`** To monitor the Velero logs, enter the following command:`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ $ oc delete ns openshift-adp`
`60`	`60`	`+`
`61`	`61`	`[source,terminal]`
`62`	`62`	`----`
`63`		`-$ oc delete backup hello-world`
	`63`	`+$ oc delete backups.velero.io hello-world`
`64`	`64`	`----`
`65`	`65`
`66`	`66`	`. To delete backup, restore and remote objects in {aws-short} S3, run the following command:`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ $ oc apply -f backup-control-plane.yaml`
`136`	`136`	`+`
`137`	`137`	`[source,terminal]`
`138`	`138`	`----`
`139`		`-$ oc get backup <backup_resource_name> -n openshift-adp -o jsonpath='{.status.phase}'`
	`139`	`+$ oc get backups.velero.io <backup_resource_name> -n openshift-adp -o jsonpath='{.status.phase}'`
`140`	`140`	`----`
`141`	`141`
`142`	`142`	`.Next steps`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ $ oc -n {namespace} exec deployment/velero -c velero -- ./velero \`
`45`	`45`	`+`
`46`	`46`	`[source,terminal]`
`47`	`47`	`----`
`48`		`-$ oc delete backup <backup> -n openshift-adp`
	`48`	`+$ oc delete backups.velero.io <backup> -n openshift-adp`
`49`	`49`	`----`
`50`	`50`	`+`
`51`	`51`	You do not need to clean up the backup location because a `Backup` CR in progress has not uploaded files to object storage.
`@@ -79,7 +79,7 @@ time="2023-02-17T16:33:13Z" level=error msg="Error backing up item" backup=opens`
`79`	`79`	`+`
`80`	`80`	`[source,terminal]`
`81`	`81`	`----`
`82`		`-$ oc delete backup <backup> -n openshift-adp`
	`82`	`+$ oc delete backups.velero.io <backup> -n openshift-adp`
`83`	`83`	`----`
`84`	`84`
`85`	`85`	. If required, clean up the stored data on the `BackupStorageLocation` to free up space.
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ To back up Kubernetes resources, internal images, and persistent volumes (PVs),`
`27`	`27`	`+`
`28`	`28`	`[source,terminal]`
`29`	`29`	`----`
`30`		`-$ oc get backupStorageLocations -n openshift-adp`
	`30`	`+$ oc get backupstoragelocations.velero.io -n openshift-adp`
`31`	`31`	`----`
`32`	`32`	`+`
`33`	`33`	`.Example output`
`@@ -79,5 +79,5 @@ spec:`
`79`	`79`	`+`
`80`	`80`	`[source,terminal]`
`81`	`81`	`----`
`82`		`-$ oc get backup -n openshift-adp <backup> -o jsonpath='{.status.phase}'`
	`82`	`+$ oc get backups.velero.io -n openshift-adp <backup> -o jsonpath='{.status.phase}'`
`83`	`83`	`----`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ spec:`
`46`	`46`	`+`
`47`	`47`	`[source,terminal]`
`48`	`48`	`----`
`49`		`-$ oc get restore -n openshift-adp <restore> -o jsonpath='{.status.phase}'`
	`49`	`+$ oc get restores.velero.io -n openshift-adp <restore> -o jsonpath='{.status.phase}'`
`50`	`50`	`----`
`51`	`51`
`52`	`52`	`. Verify that the backup resources have been restored by entering the following command:`