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.

Sign up for GitHub

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

[1.15] hide restic deprecation warning for install with crd-only #8540

Merged
merged 1 commit into from
Dec 20, 2024
Merged

[1.15] hide restic deprecation warning for install with crd-only #8540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelogs/CHANGELOG-1.15.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ https://velero.io/docs/v1.15/upgrade-to-1.15/
* Fix issue #8391, check ErrCancelled from suffix of data mover pod's termination message (#8404, @Lyndon-Li)
* Fix issue #8394, don't call closeDataPath in VGDP callbacks, otherwise, the VGDP cleanup will hang (#8402, @Lyndon-Li)
* Reduce minimum required go toolchain in release-1.15 go.mod (#8399, @kaovilai)
* Fix issue #8539, validate uploader types when o.CRDsOnly is set to false only since CRD installation doesn't rely on uploader types (#8540, @Lyndon-Li)


## v1.15
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/cli/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,17 +413,17 @@
return err
}

// If we're only installing CRDs, we can skip the rest of the validation.
if o.CRDsOnly {
return nil
}

Check warning on line 419 in pkg/cmd/cli/install/install.go

View check run for this annotation

Codecov / codecov/patch

pkg/cmd/cli/install/install.go#L417-L419 

Added lines #L417 - L419 were not covered by tests

if msg, err := uploader.ValidateUploaderType(o.UploaderType); err != nil {
return err
} else if msg != "" {
fmt.Printf("⚠️ %s\n", msg)
}

// If we're only installing CRDs, we can skip the rest of the validation.
if o.CRDsOnly {
return nil
}

// Our main 3 providers don't support bucket names starting with a dash, and a bucket name starting with one
// can indicate that an environment variable was left blank.
// This case will help catch that error
Expand Down
Loading