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

[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
Merged

[Fleet] Fix branch conditions to check against main and add skip version check config option #116530

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b892eac
Fix branch logic to point to main
jen-huang Oct 27, 2021
fd09eb7
Merge branch 'master' into fix/main-branch
kibanamachine Oct 28, 2021
81e2617
Merge remote-tracking branch 'upstream/main' into fix/main-branch
joshdover Oct 28, 2021
d445fd1
Add xpack.fleet.developer.disableRegistryVersionCheck config
joshdover Oct 28, 2021
db6ff12
lint
joshdover Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/fleet/server/mocks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;-)

kibanaBranch: 'main',
};
};

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/fleet/server/services/epm/registry/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ function setKibanaVersion(url: URL) {
const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
const kibanaBranch = appContextService.getKibanaBranch();

// on master, request all packages regardless of version
if (kibanaVersion && kibanaBranch !== 'master') {
// on main, request all packages regardless of version
if (kibanaVersion && kibanaBranch !== 'main') {
url.searchParams.set('kibana.version', kibanaVersion);
}
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const SNAPSHOT_REGISTRY_URL_CDN = 'https://epr-snapshot.elastic.co';

const getDefaultRegistryUrl = (): string => {
const branch = appContextService.getKibanaBranch();
if (branch === 'master') {
if (branch === 'main') {
return SNAPSHOT_REGISTRY_URL_CDN;
} else if (appContextService.getKibanaVersion().includes('-SNAPSHOT')) {
return STAGING_REGISTRY_URL_CDN;
Expand Down