Skip to content

Commit

Permalink
Merge pull request #8540 from Lyndon-Li/release-1.15
Browse files Browse the repository at this point in the history
[1.15] hide restic deprecation warning for install with crd-only
  • Loading branch information
kaovilai authored Dec 20, 2024
2 parents 4376a89 + 11a2be6 commit b661ed7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions changelogs/CHANGELOG-1.15.md
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
Original file line number Diff line number Diff line change
Expand Up @@ -413,17 +413,17 @@ func (o *Options) Validate(c *cobra.Command, args []string, f client.Factory) er
return err
}

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

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

0 comments on commit b661ed7

Please sign in to comment.