Skip to content
Draft
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
6 changes: 6 additions & 0 deletions config/crd/v1/bases/velero.io_backups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ spec:
spec:
description: BackupSpec defines the specification for a Velero backup.
properties:
cancel:
description: Cancel specifies whether to cancel the backup.
nullable: true
type: boolean
csiSnapshotTimeout:
description: |-
CSISnapshotTimeout specifies the time used to wait for CSI VolumeSnapshot status turns to
Expand Down Expand Up @@ -604,6 +608,8 @@ spec:
- PartiallyFailed
- Failed
- Deleting
- Cancelling
- Cancelled
type: string
progress:
description: |-
Expand Down
4 changes: 4 additions & 0 deletions config/crd/v1/bases/velero.io_schedules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ spec:
Template is the definition of the Backup to be run
on the provided schedule
properties:
cancel:
description: Cancel specifies whether to cancel the backup.
nullable: true
type: boolean
csiSnapshotTimeout:
description: |-
CSISnapshotTimeout specifies the time used to wait for CSI VolumeSnapshot status turns to
Expand Down
4 changes: 2 additions & 2 deletions config/crd/v1/crds/crds.go

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion pkg/apis/velero/v1/backup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@
// +optional
// +nullable
UploaderConfig *UploaderConfigForBackup `json:"uploaderConfig,omitempty"`

// Cancel specifies whether to cancel the backup.
// +optional
// +nullable
Cancel *bool `json:"cancel,omitempty"`
}

// UploaderConfigForBackup defines the configuration for the uploader when doing backup.
Expand Down Expand Up @@ -288,7 +293,7 @@

// BackupPhase is a string representation of the lifecycle phase
// of a Velero backup.
// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;WaitingForPluginOperations;WaitingForPluginOperationsPartiallyFailed;Finalizing;FinalizingPartiallyFailed;Completed;PartiallyFailed;Failed;Deleting
// +kubebuilder:validation:Enum=New;FailedValidation;InProgress;WaitingForPluginOperations;WaitingForPluginOperationsPartiallyFailed;Finalizing;FinalizingPartiallyFailed;Completed;PartiallyFailed;Failed;Deleting;Cancelling;Cancelled

Check failure on line 296 in pkg/apis/velero/v1/backup_types.go

View workflow job for this annotation

GitHub Actions / Run Linter Check

`Cancelling` is a misspelling of `Canceling` (misspell)
type BackupPhase string

const (
Expand Down Expand Up @@ -349,6 +354,12 @@

// BackupPhaseDeleting means the backup and all its associated data are being deleted.
BackupPhaseDeleting BackupPhase = "Deleting"

// BackupPhaseCancelling means the backup is in the process of being cancelled.

Check failure on line 358 in pkg/apis/velero/v1/backup_types.go

View workflow job for this annotation

GitHub Actions / Run Linter Check

`cancelled` is a misspelling of `canceled` (misspell)
BackupPhaseCancelling BackupPhase = "Cancelling"

// BackupPhaseCancelled means the backup was successfully cancelled.
BackupPhaseCancelled BackupPhase = "Cancelled"
)

// BackupStatus captures the current status of a Velero backup.
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/velero/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading