Skip to content

Cleanup Federation Redundant Code#1928

Merged
crivetimihai merged 11 commits intomainfrom
1912_cleanup_federation
Jan 7, 2026
Merged

Cleanup Federation Redundant Code#1928
crivetimihai merged 11 commits intomainfrom
1912_cleanup_federation

Conversation

@kevalmahajan
Copy link
Copy Markdown
Member

@kevalmahajan kevalmahajan commented Jan 6, 2026

🐛 Bug-fix PR

📌 Summary

Closes #1912

🐞 Root Cause

  • DiscoveryService (mDNS auto-discovery) is not required for the current deployment model.
  • ForwardingService logic is largely duplicated by ToolService, which implements a more advanced version of tool invocation (supporting OAuth, Plugins, SSE).

💡 Fix Description

  1. Cleanedup federation code, documentation, env variables, etc.
  2. Deprecated DiscoveryService functionality and these variables:
FEDERATION_ENABLED 
FEDERATION_DISCOVERY
FEDERATION_PEERS
FEDERATION_SYNC_INTERVAL

🧪 Verification

Check Command Status
Lint suite make lint
Unit tests make test
Coverage ≥ 90 % make coverage
Manual regression no longer fails steps / screenshots

📐 MCP Compliance (if relevant)

  • Matches current MCP spec
  • No breaking change to MCP clients

✅ Checklist

  • Code formatted (make black isort pre-commit)
  • No secrets/credentials committed

kevalmahajan and others added 11 commits January 7, 2026 02:59
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
- Remove FEDERATION_ENABLED=true setup requirement from FED-001
- Remove FED-009 and FED-010 tests for deprecated /federation/discover
  and /federation/status endpoints

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
- Mark ADR-008 as deprecated with proper metadata and rationale
- Add deprecation notice explaining migration path
- Update tense to past for historical accuracy
- Add CHANGELOG entry for federation deprecation in 1.0.0-BETA-2

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
- Remove MCPGATEWAY_ENABLE_FEDERATION from deployment configs
- Remove Federation & Discovery section from CLAUDE.md
- Remove federation setting from ADR-019 example

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
- Add detailed comments in config.py explaining the setting's purpose
- Update charts values.yaml and schema with accurate descriptions
- Rename admin UI section from "Federation" to "Connection Timeouts"
- Clarify this setting is used for gateway/server HTTP request timeouts

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
@crivetimihai crivetimihai force-pushed the 1912_cleanup_federation branch from d53fa65 to 89e7a7c Compare January 7, 2026 03:17
Copy link
Copy Markdown
Member

@crivetimihai crivetimihai left a comment

Choose a reason for hiding this comment

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

Rebased and updated

@crivetimihai crivetimihai merged commit da08b2f into main Jan 7, 2026
52 checks passed
@crivetimihai crivetimihai deleted the 1912_cleanup_federation branch January 7, 2026 03:28
kcostell06 pushed a commit to kcostell06/mcp-context-forge that referenced this pull request Feb 24, 2026
* cleanup federation files

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* deprecate FEDERATION_ENABLED

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* deprecated FEDERATION_DISCOVERY

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* deprecate FEDERATION_PEERS

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* Deprecate FEDERATION_SYNC_INTERVAL

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* update docs

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>

* fix: remove deprecated federation settings from manual test cases

- Remove FEDERATION_ENABLED=true setup requirement from FED-001
- Remove FED-009 and FED-010 tests for deprecated /federation/discover
  and /federation/status endpoints

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* docs: update ADR-008 to deprecated status and add CHANGELOG entry

- Mark ADR-008 as deprecated with proper metadata and rationale
- Add deprecation notice explaining migration path
- Update tense to past for historical accuracy
- Add CHANGELOG entry for federation deprecation in 1.0.0-BETA-2

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* chore: remove deprecated federation settings from docs and examples

- Remove MCPGATEWAY_ENABLE_FEDERATION from deployment configs
- Remove Federation & Discovery section from CLAUDE.md
- Remove federation setting from ADR-019 example

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* docs: improve federation_timeout documentation

- Add detailed comments in config.py explaining the setting's purpose
- Update charts values.yaml and schema with accurate descriptions
- Rename admin UI section from "Federation" to "Connection Timeouts"
- Clarify this setting is used for gateway/server HTTP request timeouts

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Rebase and lint

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

---------

Signed-off-by: Keval Mahajan <mahajankeval23@gmail.com>
Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Co-authored-by: Mihai Criveti <crivetimihai@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CHORE]: Cleanup unused Federation module and duplicate Forwarding logic

2 participants