diff --git a/design/upload-progress.md b/design/upload-progress.md index 556d39cb1..2a3db0c71 100644 --- a/design/upload-progress.md +++ b/design/upload-progress.md @@ -89,7 +89,7 @@ will be deleted and at that point any uploads still in progress should be aborte ### Uploading (new) The "Uploading" phase signifies that the main part of the backup, including snapshotting has completed successfully -and and uploading is continuing. In the event of an error during uploading, the phase will change to +and uploading is continuing. In the event of an error during uploading, the phase will change to UploadingPartialFailure. On success, the phase changes to Completed. The backup cannot be restored from when it is in the Uploading state. diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index a42c0589c..826fb3000 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -503,7 +503,7 @@ func (s *server) veleroResourcesExist() error { } if len(errs) > 0 { - errs = append(errs, errors.New("Velero custom resources not found - apply examples/common/00-prereqs.yaml to update the custom resource definitions")) + errs = append(errs, errors.New("Velero custom resources not found - apply config/crd/v1/bases/*.yaml,config/crd/v2alpha1/bases*.yaml, to update the custom resource definitions")) return kubeerrs.NewAggregate(errs) }