Sync upstream fleetdm/fleet@main into fork (incremental merge + fixes) - #53
Closed
oleksandrd-flamingo wants to merge 8218 commits into
Closed
Sync upstream fleetdm/fleet@main into fork (incremental merge + fixes)#53oleksandrd-flamingo wants to merge 8218 commits into
oleksandrd-flamingo wants to merge 8218 commits into
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Sync the fork with the latest upstream fleetdm/fleet@main. This is an incremental merge on top of the previous upstream sync — git's merge base is the prior sync's upstream parent, so only the 24 new upstream commits had to be reconciled (not the full history). All OpenFrame fork features are preserved, and two issues the sync surfaced are fixed.
Keep this a merge commit — do not squash. The merge commit is what keeps the next weekly sync incremental (a squash would force the whole history to re-reconcile next time).
Improvements
upstream/main(585a065870) — 24 new upstream commits. 3 conflicts resolved:cmd/fleet/serve.go— upstream extracted cron registration intocmd/fleet/cron_registration.go(Extract cron schedule registration out of runServeCmd fleetdm/fleet#47562); relocated the OpenFramequery_results_ttl_cleanupschedule into the newregisterCleanupAndMaintenanceCrons.charts/fleet/{Chart.yaml,values.yaml}— kept the fork's own release versioning (an upstream sync must not auto-bump the fork's chart/app/image versions).712ae6e5ff) — upstream moved the orbit client intoclient/, which brought an arch-guard test (TestClientPackageDoesNotImportServerService) forbiddingclientfrom importingserver/service*. The fork's agent-only, dependency-freeserver/service/openframepackage was tripping it; moved it topkg/openframe. No behavior change.6b50679bc9) — upstream PR Re-timestamp migrations due to 4.79 cherry pick. fleetdm/fleet#37993 re-timestamped two migrations the fork already carries under their original timestamps; the merge kept both, soprepare dbaborted withDuplicate column nameon any DB that already ran the fork copies (i.e. every existing tenant). Guarded the two upstream copies with the fork's existingcolumnExistshelper.7fb36394fe) — documented the duplicate-migration hazard, detection one-liner, and idempotency fix inopenframe/docs/migrations.md.Validation
go build ./...green;fastandcmd/fleet(MySQL) Go test bundles green;clientarch-guard test passes.prepare db→ all ~90 upstreamtables+data+ openframe migrations completed; server boots inFLEET_OPENFRAME_MODEwith no migration warning, UI serves at/login,policy_hosts/query_hostspresent, and the OpenFrame-gated cron registers. The live tenant DB was never modified.Task
N/A — fork maintenance (weekly upstream sync).