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

[Fleet] Do not allow alpha, beta, rc suffixes in agent versions #211787

Merged
merged 4 commits into from
Feb 19, 2025

Conversation

juliaElastic
Copy link
Contributor

@juliaElastic juliaElastic commented Feb 19, 2025

Summary

Closes #211777

Add agent flyout should not show 9.0.0 or 9.0.0-beta1 now as currently only 9.0.0-rc1 is available:
Screenshot 2025-02-19 at 1 21 26 PM

GET kbn:/api/fleet/agents/available_versions
{
  "items": [
    "8.17.2",
    "8.17.1",
    "8.17.0",
    "8.16.4",
    "8.16.3",
    "8.16.2",
    "8.16.1",
    "8.16.0",
    "8.15.5",
    "8.15.4",
    "8.15.3+build202411051926",
    "8.15.3",
    "8.15.2",
    "8.15.1",
    "8.15.0",
    "8.14.3+build202407291657",
    "8.14.3+build202408141002",
    "8.14.3",
    "8.14.2",
    "8.14.1",
    "8.14.0",
    "8.13.4",
    "8.13.3",
    "8.13.2",
    "8.13.1",
    "8.13.0",
    "8.12.2",
    "8.12.1",
    "8.12.0",
    "8.11.4",
    "8.11.3",
    "8.11.2",
    "8.11.1",
    "8.11.0",
    "8.10.4",
    "8.10.3",
    "8.10.2",
    "8.10.1",
    "8.10.0",
    "8.9.2",
    "8.9.1",
    "8.9.0",
    "8.8.2",
    "8.8.1",
    "8.8.0",
    "8.7.1",
    "8.7.0",
    "8.6.2",
    "8.6.1",
    "8.6.0",
    "8.5.3",
    "8.5.2",
    "8.5.1",
    "8.5.0",
    "8.4.3",
    "8.4.2",
    "8.4.1",
    "8.4.0",
    "8.3.3",
    "8.3.2",
    "8.3.1",
    "8.3.0",
    "8.2.3",
    "8.2.2",
    "8.2.1",
    "8.2.0",
    "8.1.3",
    "8.1.2",
    "8.1.1",
    "8.1.0",
    "8.0.1",
    "8.0.0",
    "7.17.27",
    "7.17.26",
    "7.17.25",
    "7.17.24",
    "7.17.23",
    "7.17.22",
    "7.17.21",
    "7.17.20",
    "7.17.19",
    "7.17.18",
    "7.17.17",
    "7.17.16",
    "7.17.15",
    "7.17.14",
    "7.17.13",
    "7.17.12",
    "7.17.11",
    "7.17.10",
    "7.17.9",
    "7.17.8",
    "7.17.7",
    "7.17.6",
    "7.17.5",
    "7.17.4",
    "7.17.3",
    "7.17.2",
    "7.17.1",
    "7.17.0"
  ]
}

Checklist

@juliaElastic juliaElastic added release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) labels Feb 19, 2025
@juliaElastic juliaElastic self-assigned this Feb 19, 2025
@juliaElastic juliaElastic marked this pull request as ready for review February 19, 2025 15:01
@juliaElastic juliaElastic requested a review from a team as a code owner February 19, 2025 15:01
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Feb 19, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@juliaElastic
Copy link
Contributor Author

/ci

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

code LGTM 🚀

@juliaElastic juliaElastic enabled auto-merge (squash) February 19, 2025 15:44
Copy link
Member

@kpollich kpollich left a comment

Choose a reason for hiding this comment

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

I think we want to exclude beta/rc versions from this list in serverless. Right now, we're showing 9.0.0 in serverless because we see 9.0.1-beta-1 as available based on the product versions API, and then it's coerced to 9.0.0. At least for serverless production we should not be showing prerelease versions of agent (except for versions that end in +build 🙃) at all.

@nchaulet nchaulet changed the title [Fleet] allow alpha, beta, rc suffixes in agent versions [Fleet] Do not allow alpha, beta, rc suffixes in agent versions Feb 19, 2025
@nchaulet nchaulet requested a review from kpollich February 19, 2025 18:22
Copy link
Member

@kpollich kpollich 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 updating this @nchaulet

@juliaElastic juliaElastic merged commit ba2caf9 into elastic:main Feb 19, 2025
9 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 9.0

https://github.com/elastic/kibana/actions/runs/13421903875

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @juliaElastic

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Feb 19, 2025
)

## Summary

Closes elastic#211777

Add agent flyout should show `9.0.0-beta1` now:
<img width="2540" alt="image"
src="https://github.com/user-attachments/assets/86259eea-5858-4d06-8989-8fadb3a57f96"
/>

When `9.0.0` comes out, that should show up as latest. For example,
`8.0.0` versions come back in this order:
<img width="462" alt="image"
src="https://github.com/user-attachments/assets/c5204806-3cf7-4c65-bb60-21d176f24f17"
/>

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

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

💚 All backports created successfully

Status Branch Result
9.0

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Feb 19, 2025
…) (#211849)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[Fleet] allow alpha, beta, rc suffixes in agent versions
(#211787)](#211787)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Julia
Bardi","email":"90178898+juliaElastic@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-02-19T20:37:28Z","message":"[Fleet]
allow alpha, beta, rc suffixes in agent versions (#211787)\n\n##
Summary\n\nCloses https://github.com/elastic/kibana/issues/211777\n\nAdd
agent flyout should show `9.0.0-beta1` now:\n<img width=\"2540\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/86259eea-5858-4d06-8989-8fadb3a57f96\"\n/>\n\nWhen
`9.0.0` comes out, that should show up as latest. For example,\n`8.0.0`
versions come back in this order:\n<img width=\"462\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/c5204806-3cf7-4c65-bb60-21d176f24f17\"\n/>\n\n\n\n###
Checklist\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"ba2caf92c6e70d94d9743ff7628400750cb35d51","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v9.1.0"],"title":"[Fleet]
Do not allow alpha, beta, rc suffixes in agent
versions","number":211787,"url":"https://github.com/elastic/kibana/pull/211787","mergeCommit":{"message":"[Fleet]
allow alpha, beta, rc suffixes in agent versions (#211787)\n\n##
Summary\n\nCloses https://github.com/elastic/kibana/issues/211777\n\nAdd
agent flyout should show `9.0.0-beta1` now:\n<img width=\"2540\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/86259eea-5858-4d06-8989-8fadb3a57f96\"\n/>\n\nWhen
`9.0.0` comes out, that should show up as latest. For example,\n`8.0.0`
versions come back in this order:\n<img width=\"462\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/c5204806-3cf7-4c65-bb60-21d176f24f17\"\n/>\n\n\n\n###
Checklist\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"ba2caf92c6e70d94d9743ff7628400750cb35d51"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/211787","number":211787,"mergeCommit":{"message":"[Fleet]
allow alpha, beta, rc suffixes in agent versions (#211787)\n\n##
Summary\n\nCloses https://github.com/elastic/kibana/issues/211777\n\nAdd
agent flyout should show `9.0.0-beta1` now:\n<img width=\"2540\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/86259eea-5858-4d06-8989-8fadb3a57f96\"\n/>\n\nWhen
`9.0.0` comes out, that should show up as latest. For example,\n`8.0.0`
versions come back in this order:\n<img width=\"462\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/c5204806-3cf7-4c65-bb60-21d176f24f17\"\n/>\n\n\n\n###
Checklist\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"ba2caf92c6e70d94d9743ff7628400750cb35d51"}}]}]
BACKPORT-->

Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (9.0) 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 v9.0.0 v9.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet] 9.0.0-beta1 builds target nonexistant 9.0.0 agent images
5 participants