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

Add server setting for resource timeouts #5926

Merged
merged 1 commit into from Mar 13, 2023

Conversation

eemcmullan
Copy link
Contributor

@eemcmullan eemcmullan commented Feb 27, 2023

Thank you for contributing to Velero!

Please add a summary of your change

Added a server config setting to use for any default timeouts.

Does your change fix a particular issue?

Fixes #(issue)
#5604

Please indicate you've done the following:

  • [ x] Accepted the DCO. Commits without the DCO will delay acceptance.
  • [x ] Created a changelog file or added /kind changelog-not-required as a comment on this pull request.
  • [x ] Updated the corresponding documentation in site/content/docs/main.

pkg/restore/restore.go Outdated Show resolved Hide resolved
@blackpiglet
Copy link
Contributor

Please add a changelog file too.

sseago
sseago previously approved these changes Feb 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 28, 2023

Codecov Report

Merging #5926 (b298e6c) into main (c6fba55) will increase coverage by 0.02%.
The diff coverage is 23.80%.

@@            Coverage Diff             @@
##             main    #5926      +/-   ##
==========================================
+ Coverage   39.94%   39.97%   +0.02%     
==========================================
  Files         253      254       +1     
  Lines       22259    22368     +109     
==========================================
+ Hits         8892     8941      +49     
- Misses      12716    12772      +56     
- Partials      651      655       +4     
Impacted Files Coverage Δ
pkg/cmd/server/server.go 6.58% <0.00%> (-0.05%) ⬇️
pkg/repository/ensurer.go 0.00% <0.00%> (ø)
pkg/restore/restore.go 64.76% <25.00%> (+0.13%) ⬆️
pkg/controller/backup_controller.go 55.80% <66.66%> (-0.08%) ⬇️
pkg/controller/restore_controller.go 67.56% <0.00%> (-1.45%) ⬇️
pkg/persistence/object_store.go 53.19% <0.00%> (-0.04%) ⬇️
pkg/util/results/result.go 100.00% <0.00%> (ø)
pkg/cmd/util/output/restore_describer.go 0.00% <0.00%> (ø)
pkg/restore/request.go 100.00% <0.00%> (ø)
... and 2 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

pkg/cmd/server/server.go Outdated Show resolved Hide resolved
sseago
sseago previously approved these changes Mar 1, 2023
pkg/restore/restore.go Outdated Show resolved Hide resolved
pkg/controller/backup_controller.go Outdated Show resolved Hide resolved
@eemcmullan eemcmullan requested review from kaovilai and removed request for blackpiglet March 6, 2023 15:13
kaovilai
kaovilai previously approved these changes Mar 7, 2023
@blackpiglet
Copy link
Contributor

@eemcmullan
Hi, this PR looks good, but there are some conflicts due to the recent PRs merge. Could you please resolve the conflicts?

sseago
sseago previously approved these changes Mar 9, 2023
blackpiglet
blackpiglet previously approved these changes Mar 10, 2023
@blackpiglet
Copy link
Contributor

@eemcmullan
Some PRs have been merged recently. I tried to resolve the new conflict on the web editor, but the code's indent is messed up.
Could you take a look?

Signed-off-by: Emily McMullan <emcmulla@redhat.com>
@blackpiglet blackpiglet merged commit 36163c9 into vmware-tanzu:main Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants