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

[8.5](backport #1912) LoadLimits does not override existing values #1914

Merged
merged 3 commits into from
Sep 27, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2022

This is an automatic backport of pull request #1912 done by Mergify.
Cherry-pick of 1b2834c has failed:

On branch mergify/bp/8.5/pr-1912
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit 1b2834c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/config/cache.go
	modified:   internal/pkg/config/config_test.go
	modified:   internal/pkg/config/limits.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Fleet-server will use any specified cache or server limit values over
whatever is returned by the default/agent number loader. For example, if
A max body size is specifically set to a value such as 5MB, and the
default returned by the LoadLimits is 1MB, the 5MB value is used.

(cherry picked from commit 1b2834c)

# Conflicts:
#	CHANGELOG.next.asciidoc
@mergify mergify bot requested a review from a team as a code owner September 26, 2022 22:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 26, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 26, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-27T16:30:46.291+0000

  • Duration: 15 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 335
Skipped 1
Total 336

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@michel-laterman
Copy link
Contributor

/test

@michel-laterman
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 26, 2022

refresh

✅ Pull request refreshed

@mergify mergify bot merged commit 59355d6 into 8.5 Sep 27, 2022
@mergify mergify bot deleted the mergify/bp/8.5/pr-1912 branch September 27, 2022 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants