Introduce editable SPIRE fork alongside overlay#197
Merged
saiakhil2012 merged 1 commit intolfedgeai:mainfrom Feb 27, 2026
Merged
Introduce editable SPIRE fork alongside overlay#197saiakhil2012 merged 1 commit intolfedgeai:mainfrom
saiakhil2012 merged 1 commit intolfedgeai:mainfrom
Conversation
Add spire-fork/ and spire-fork-sdk/ as directly editable source trees
(SPIRE v1.14.1 with all Aegis modifications applied) alongside the
existing patch-based overlay system.
SPIRE_MODE=fork (default) Build from spire-fork/ — edit Go files
directly, no patch tooling required.
SPIRE_MODE=overlay Clone upstream and apply overlay patches.
scripts/spire-build.sh delegates to the new spire-fork-build.sh when
fork mode is active. All existing test scripts are unchanged.
saiakhil2012
force-pushed
the
akhil/spire-fork-overlay-options
branch
from
e1347e2 to
ccfba36
Compare
ramkri123
added a commit
that referenced
this pull request
Mar 6, 2026
Major changes: - spire-fork: sync Go source (claims.go, plugin.go, client.go, attested_claims_extension.go) with compiled binaries — ensures fresh builds produce correct lah-bundle with workload-identity-agent-image-digest - spire-overlay: removed — consolidated into spire-fork (PR #197) - Demo scripts: improved test_agents.sh, test_control_plane.sh, test_integration.sh, test_onprem.sh reliability - WASM plugin: updated Envoy filter for lah-bundle parsing - Rust agent: geolocation_handler.rs improvements - Proto: updated sovereignattestation.proto definitions - Docs: added FAQ.md, CONTRIBUTING.md, LICENSE, SECURITY.md, demo screenshots, appendix tables - CI: updated workflow, build scripts cleaned up All integration tests pass on both demo hosts (10.1.0.10, 10.1.0.11).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Adds
spire-fork/— a fully assembled, directly editable SPIRE source tree with all AegisSovereignAI modifications pre applied — as a first-class build input alongside the existing overlay patch system.The build system now selects the mode automatically based on which source is present, with no changes required to any downstream scripts or test workflows.
Motivation
The overlay patch system is the right model for long-term maintainability: diffs are minimal, the upstream relationship is explicit, and regenerating a clean fork from scratch is a single script invocation. However, patch-centric workflows impose friction during exploratory, high-velocity development phases where dozens of files may change across a short iteration window.
Rather than force a choice between maintainability and iteration speed, this PR makes both available simultaneously. Teams can work directly against committed source during active development and switch back to the overlay as changes
stabilize — with no process change required.
What Changed
spire-fork/spire-fork-sdk/spire-api-sdkfork with Aegis proto extensions. Module paths use relative references — works on any clone.scripts/spire-fork-build.shscripts/spire-build.shspire-fork/is present;SPIRE_MODE=overlayrestores clone-and-patch behavior..gitignorecmd/spire-server/andcmd/spire-agent/source directories from being tracked.Usage