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] Fix branch conditions to check against main and add skip version check config option #116530

Merged
merged 5 commits into from
Oct 29, 2021

Conversation

jen-huang
Copy link
Contributor

@jen-huang jen-huang commented Oct 27, 2021

Summary

This PR updates some conditions in Fleet which check against the branch name. Do not merge until default branch in this repo has been renamed to main as well.

This also adds the config option xpack.fleet.developer.disableRegistryVersionCheck that enables bypassing of Kibana version constraints on requests to EPR. This is currently true by default until 8.0 packages are published and tests which depend on those packages are able to pass without bypassing version check (#102283, #102282, #116522).

@jen-huang jen-huang added chore v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team auto-backport Deprecated - use backport:version if exact versions are needed v8.1.0 labels Oct 27, 2021
@jen-huang jen-huang self-assigned this Oct 27, 2021
@jen-huang jen-huang requested a review from a team as a code owner October 27, 2021 23:39
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@kpollich
Copy link
Member

@elasticmachine merge upstream

@joshdover
Copy link
Contributor

Taking over this PR to fix Kibana CI due issue with EPR on 8.0.0

@jen-huang
Copy link
Contributor Author

Thanks @joshdover!

@joshdover joshdover enabled auto-merge (squash) October 28, 2021 17:19
@jbudz
Copy link
Member

jbudz commented Oct 28, 2021

I pushed 9e2bda7, 714b007, and 234692f to 8.0 that may be able to be reverted when this is backported

@@ -57,8 +57,8 @@ export const createAppContextStartContractMock = (): MockedFleetAppContext => {
agentIdVerificationEnabled: true,
},
config$,
kibanaVersion: '8.0.0',
kibanaBranch: 'master',
kibanaVersion: '8.99.0', // Fake version :)
Copy link
Contributor

Choose a reason for hiding this comment

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

At least until ~2030 ;-)

@jen-huang jen-huang changed the title [Fleet] Fix branch conditions to check against main [Fleet] Fix branch conditions to check against main and add skip version check config option Oct 28, 2021
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
fleet 1120 1121 +1
Unknown metric groups

API count

id before after diff
fleet 1222 1223 +1

History

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

cc @joshdover @jen-huang

@shivindera shivindera changed the base branch from master to main October 29, 2021 09:41
@brianseeders brianseeders changed the base branch from main to master October 29, 2021 15:18
@brianseeders brianseeders disabled auto-merge October 29, 2021 16:47
@brianseeders brianseeders merged commit 2194f2b into elastic:main Oct 29, 2021
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 29, 2021
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
8.0

This backport PR will be merged automatically after passing CI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed chore release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.0.0 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants