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

Jump to bottom

[Fleet] Allow agent force upgrading to a newer patch release #142450

Merged
merged 4 commits into from
Oct 4, 2022
Merged

[Fleet] Allow agent force upgrading to a newer patch release #142450

merged 4 commits into from
Oct 4, 2022

Conversation

joshdover
Copy link
Contributor

@joshdover joshdover commented Oct 3, 2022 •
edited by kibanamachine
Loading

Summary

This change allows customers to test new patch releases of Agent before they're officially released. This is only supported on the upgrade API when using the force: true flag. Upgrading to a newer minor or major are still not supported.

Checklist

@joshdover joshdover added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team backport:all-open Backport to all branches that could still receive a release labels Oct 3, 2022
@joshdover joshdover requested a review from a team as a code owner October 3, 2022 10:10
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

criamico
criamico reviewed Oct 3, 2022
View reviewed changes
x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts Outdated Show resolved Hide resolved
x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts Outdated
if (
force &&
!(
semverMajor(kibanaVersionNumber) > semverMajor(versionToUpgradeNumber) ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this condition would be more readable if extracted in a function. This file is becoming kinda difficult to read with all the different cases, simplifying ot would help maintaining it :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed it's confusing :) I extracted this into named variables and added comments. I didn't think a function would make a lot of sense because it's not reused elsewhere. Let me know what you think.

@joshdover joshdover requested a review from criamico October 4, 2022 09:48
@joshdover joshdover enabled auto-merge (squash) October 4, 2022 09:48
criamico
criamico approved these changes Oct 4, 2022
View reviewed changes
Copy link
Contributor

@criamico criamico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes :) LGTM!

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@joshdover joshdover merged commit b8c17b0 into elastic:main Oct 4, 2022
@joshdover joshdover added the backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) label Oct 4, 2022
@kibanamachine kibanamachine mentioned this pull request Oct 4, 2022
Merged
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
❌ 7.17 Backport failed because of merge conflicts
✅ 8.5

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 142450

Questions ?

Please refer to the Backport tool documentation

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 4, 2022
@joshdover
[Fleet] Allow agent force upgrading to a newer patch release (elastic…
b8caadc 
…#142450)

(cherry picked from commit b8c17b0)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
❌ 7.17 Backport failed because of merge conflicts
✅ 8.5

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 142450

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 4, 2022
@kibanamachine @joshdover
[Fleet] Allow agent force upgrading to a newer patch release (#142450) (
71cab61 
#142581)

(cherry picked from commit b8c17b0)

Co-authored-by: Josh Dover <[email protected]>
@joshdover joshdover removed the backport:all-open Backport to all branches that could still receive a release label Oct 4, 2022
WafaaNasr pushed a commit to WafaaNasr/kibana that referenced this pull request Oct 11, 2022
@joshdover @WafaaNasr
[Fleet] Allow agent force upgrading to a newer patch release (elastic…
991a579 
…#142450)
WafaaNasr pushed a commit to WafaaNasr/kibana that referenced this pull request Oct 14, 2022
@joshdover @WafaaNasr
[Fleet] Allow agent force upgrading to a newer patch release (elastic…
943b447 
…#142450)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@criamico criamico criamico approved these changes

Assignees
No one assigned
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.5.0 v8.6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@joshdover @elasticmachine @kibana-ci @kibanamachine @criamico