Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Show backup/restore progress in NAB/NAR status #1649

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,22 @@ spec:
- get
- patch
- update
- apiGroups:
- velero.io
resources:
- datadownloads
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
- datauploads
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
Expand All @@ -855,6 +871,22 @@ spec:
- patch
- update
- watch
- apiGroups:
- velero.io
resources:
- podvolumebackups
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
- podvolumerestores
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
Expand Down
66 changes: 66 additions & 0 deletions bundle/manifests/oadp.openshift.io_nonadminbackups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,72 @@ spec:
- type
type: object
type: array
dataMoverDataUploads:
description: DataMoverDataUploads contains information of the related
Velero DataUpload objects.
properties:
accepted:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Accepted
type: integer
canceled:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Canceled
type: integer
canceling:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Canceling
type: integer
completed:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Completed
type: integer
failed:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Failed
type: integer
inProgress:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase InProgress
type: integer
new:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase New
type: integer
prepared:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Prepared
type: integer
total:
description: number of DataUploads related to this NonAdminBackup's
Backup
type: integer
type: object
fileSystemPodVolumeBackups:
description: FileSystemPodVolumeBackups contains information of the
related Velero PodVolumeBackup objects.
properties:
completed:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase Completed
type: integer
failed:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase Failed
type: integer
inProgress:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase InProgress
type: integer
new:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase New
type: integer
total:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup
type: integer
type: object
phase:
description: phase is a simple one high-level summary of the lifecycle
of an NonAdminBackup.
Expand Down
66 changes: 66 additions & 0 deletions bundle/manifests/oadp.openshift.io_nonadminrestores.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,72 @@ spec:
- type
type: object
type: array
dataMoverDataDownloads:
description: DataMoverDataDownloads contains information of the related
Velero DataDownload objects.
properties:
accepted:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Accepted
type: integer
canceled:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Canceled
type: integer
canceling:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Canceling
type: integer
completed:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Completed
type: integer
failed:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Failed
type: integer
inProgress:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase InProgress
type: integer
new:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase New
type: integer
prepared:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Prepared
type: integer
total:
description: number of DataDownloads related to this NonAdminRestore's
Restore
type: integer
type: object
fileSystemPodVolumeRestores:
description: FileSystemPodVolumeRestores contains information of the
related Velero PodVolumeRestore objects.
properties:
completed:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase Completed
type: integer
failed:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase Failed
type: integer
inProgress:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase InProgress
type: integer
new:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase New
type: integer
total:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore
type: integer
type: object
phase:
description: phase is a simple one high-level summary of the lifecycle
of an NonAdminRestore.
Expand Down
66 changes: 66 additions & 0 deletions config/crd/bases/oadp.openshift.io_nonadminbackups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,72 @@ spec:
- type
type: object
type: array
dataMoverDataUploads:
description: DataMoverDataUploads contains information of the related
Velero DataUpload objects.
properties:
accepted:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Accepted
type: integer
canceled:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Canceled
type: integer
canceling:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Canceling
type: integer
completed:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Completed
type: integer
failed:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Failed
type: integer
inProgress:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase InProgress
type: integer
new:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase New
type: integer
prepared:
description: number of DataUploads related to this NonAdminBackup's
Backup in phase Prepared
type: integer
total:
description: number of DataUploads related to this NonAdminBackup's
Backup
type: integer
type: object
fileSystemPodVolumeBackups:
description: FileSystemPodVolumeBackups contains information of the
related Velero PodVolumeBackup objects.
properties:
completed:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase Completed
type: integer
failed:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase Failed
type: integer
inProgress:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase InProgress
type: integer
new:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup in phase New
type: integer
total:
description: number of PodVolumeBackups related to this NonAdminBackup's
Backup
type: integer
type: object
phase:
description: phase is a simple one high-level summary of the lifecycle
of an NonAdminBackup.
Expand Down
66 changes: 66 additions & 0 deletions config/crd/bases/oadp.openshift.io_nonadminrestores.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,72 @@ spec:
- type
type: object
type: array
dataMoverDataDownloads:
description: DataMoverDataDownloads contains information of the related
Velero DataDownload objects.
properties:
accepted:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Accepted
type: integer
canceled:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Canceled
type: integer
canceling:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Canceling
type: integer
completed:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Completed
type: integer
failed:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Failed
type: integer
inProgress:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase InProgress
type: integer
new:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase New
type: integer
prepared:
description: number of DataDownloads related to this NonAdminRestore's
Restore in phase Prepared
type: integer
total:
description: number of DataDownloads related to this NonAdminRestore's
Restore
type: integer
type: object
fileSystemPodVolumeRestores:
description: FileSystemPodVolumeRestores contains information of the
related Velero PodVolumeRestore objects.
properties:
completed:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase Completed
type: integer
failed:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase Failed
type: integer
inProgress:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase InProgress
type: integer
new:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore in phase New
type: integer
total:
description: number of PodVolumeRestores related to this NonAdminRestore's
Restore
type: integer
type: object
phase:
description: phase is a simple one high-level summary of the lifecycle
of an NonAdminRestore.
Expand Down
32 changes: 32 additions & 0 deletions config/non-admin-controller_rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,22 @@ rules:
- get
- patch
- update
- apiGroups:
- velero.io
resources:
- datadownloads
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
- datauploads
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
Expand All @@ -172,6 +188,22 @@ rules:
- patch
- update
- watch
- apiGroups:
- velero.io
resources:
- podvolumebackups
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
- podvolumerestores
verbs:
- get
- list
- watch
- apiGroups:
- velero.io
resources:
Expand Down