Skip to content

feat(mcp): CNAMEs and wildcard Access app for per-backend MCP endpoints #27

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

Merged
xnoto merged 1 commit into from
Aug 26, 2026
Merged

feat(mcp): CNAMEs and wildcard Access app for per-backend MCP endpoints #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ No modules.
| [cloudflare_zero_trust_access_application.grafana_alerts](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.k3s](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.mcp_gateway](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.mcp_gateway_backends](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_application.warp](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_application) | resource |
| [cloudflare_zero_trust_access_group.admins](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_group) | resource |
| [cloudflare_zero_trust_access_identity_provider.github](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_access_identity_provider) | resource |
Expand Down
38 changes: 38 additions & 0 deletions cf-access-mcp.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,41 @@ resource "cloudflare_zero_trust_access_application" "mcp_gateway" {
}
]
}

# Per-backend MCP endpoints (<name>.mcp.makeitwork.cloud) terminate on the
# same toolhive proxyrunners behind the same tunnel. Wildcard application so
# each integration gets its own FQDN without a new Access app per backend;
# same service-token + admins policies as the aggregate gateway above.
resource "cloudflare_zero_trust_access_application" "mcp_gateway_backends" {
account_id = local.account_id
name = "MCP Gateway Backends"
type = "self_hosted"
domain = "*.mcp.makeitwork.cloud"
session_duration = "24h"

allowed_idps = [
cloudflare_zero_trust_access_identity_provider.github.id,
]

policies = [
{
name = "mcp-gateway-clients"
decision = "non_identity"
include = [{
service_token = {
token_id = cloudflare_zero_trust_access_service_token.mcp_gateway.id
}
}]
},
{
name = "makeitworkcloud-admins"
decision = "allow"
session_duration = "24h"
include = [{
group = {
id = cloudflare_zero_trust_access_group.admins.id
}
}]
}
]
}
11 changes: 11 additions & 0 deletions cf-tunnels.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ locals {
"grafana",
"k3s",
"mcp",
# Per-backend MCP endpoints (toolhive proxyrunners); the aggregate
# VirtualMCPServer stays at the bare "mcp" hostname above.
"apify.mcp",
"argocd-makeitwork.mcp",
"aws-docs.mcp",
"context7.mcp",
"github.mcp",
"grafana-makeitwork.mcp",
"kubernetes.mcp",
"parallel-search.mcp",
"terraform-docs.mcp",
"opencode",
"status",
"alertmanager",
Expand Down
Loading