Sort AgentTolerations when creating agent Bundle #4367
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a follow-up to: rancher/rancher#52755 , merged in Rancher recently and to avoid the problem when running Fleet standalone. It simply sorts the AgentTolerations when creating the agent Bundle so they don't differ and create later different _Content_ resources. Signed-off-by: Xavi Garcia <[email protected]>
0xavi0
force-pushed
the
tolerations-sorting
branch
from
b9dfffe to
2eed782
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds sorting functionality for AgentTolerations when creating agent Bundles to prevent the generation of different Content resources due to inconsistent toleration ordering. The change ensures deterministic ordering of tolerations, which is crucial for maintaining stable Bundle specifications.
Key Changes:
- Implemented a
sortTolerationsfunction that sorts tolerations by Key, Value, Operator, Effect, and TolerationSeconds - Added sorting of
AgentTolerationsin thenewAgentBundlemethod before creating the Bundle - Introduced comprehensive unit tests for the sorting logic and integration test for Bundle creation
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go |
Adds sortTolerations function and applies sorting to cluster's AgentTolerations before Bundle creation |
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent_test.go |
Adds TestNewAgentBundle_SortsAgentTolerations integration test and TestSortTolerations table-driven unit tests with comprehensive coverage |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
Outdated
Show resolved
Hide resolved
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
Show resolved
Hide resolved
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent_test.go
Show resolved
Hide resolved
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
Outdated
Show resolved
Hide resolved
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent_test.go
Outdated
Show resolved
Hide resolved
Signed-off-by: Xavi Garcia <[email protected]>
weyfonk
approved these changes
Nov 28, 2025
internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent_test.go
Outdated
Show resolved
Hide resolved
Signed-off-by: Xavi Garcia <[email protected]>
weyfonk
approved these changes
Nov 28, 2025
0xavi0
added a commit
to 0xavi0/fleet
that referenced
this pull request
Nov 28, 2025
* Sort AgentTolerations when creating agent Bundle This is a follow-up to: rancher/rancher#52755 , merged in Rancher recently and to avoid the problem when running Fleet standalone. It simply sorts the AgentTolerations when creating the agent Bundle so they don't differ and create later different _Content_ resources. --------- Signed-off-by: Xavi Garcia <[email protected]>
weyfonk
pushed a commit
to 0xavi0/fleet
that referenced
this pull request
Nov 28, 2025
* Sort AgentTolerations when creating agent Bundle This is a follow-up to: rancher/rancher#52755 , merged in Rancher recently and to avoid the problem when running Fleet standalone. It simply sorts the AgentTolerations when creating the agent Bundle so they don't differ and create later different _Content_ resources. --------- Signed-off-by: Xavi Garcia <[email protected]>
0xavi0
added a commit
that referenced
this pull request
Dec 1, 2025
* Sort AgentTolerations when creating agent Bundle This is a follow-up to: rancher/rancher#52755 , merged in Rancher recently and to avoid the problem when running Fleet standalone. It simply sorts the AgentTolerations when creating the agent Bundle so they don't differ and create later different _Content_ resources. --------- Signed-off-by: Xavi Garcia <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a follow-up to: rancher/rancher#52755 , merged in Rancher recently and to avoid the problem when running Fleet standalone.
It simply sorts the AgentTolerations when creating the agent Bundle so they don't differ and create later different Content resources.
It also adds a unit test to test the Bundle's tolerations sorting, that could be used as the base to add more tests about the generated Bundle in the future.
Additional Information
Checklist
- [ ] I have updated the documentation via a pull request in thefleet-docs repository.