Skip to content

chore(cf-tunnels): drop cluster_apps resource — operator owns it #3

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 2 commits into from
Apr 30, 2026
Merged

chore(cf-tunnels): drop cluster_apps resource — operator owns it #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64d55d7
chore(cf-tunnels): drop cluster_apps resource — operator owns it
xnoto Apr 30, 2026
e4d2402
docs: regenerate README via terraform-docs
xnoto Apr 30, 2026
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
9 changes: 4 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
## Requirements

| Name | Version |
|------|---------|
| ---- | ------- |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.3 |
| <a name="requirement_cloudflare"></a> [cloudflare](#requirement\_cloudflare) | ~> 5.0 |

## Providers

| Name | Version |
|------|---------|
| ---- | ------- |
| <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | ~> 5.0 |
| <a name="provider_sops"></a> [sops](#provider\_sops) | n/a |

Expand All @@ -22,7 +22,7 @@ No modules.
## Resources

| Name | Type |
|------|------|
| ---- | ---- |
| [cloudflare_dns_record.api](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
| [cloudflare_dns_record.apps](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
| [cloudflare_dns_record.apps_wildcard](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
Expand All @@ -38,7 +38,6 @@ No modules.
| [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 |
| [cloudflare_zero_trust_organization.main](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_organization) | resource |
| [cloudflare_zero_trust_tunnel_cloudflared.cluster_apps](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_tunnel_cloudflared) | resource |
| [cloudflare_zero_trust_tunnel_cloudflared.warp](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_tunnel_cloudflared) | resource |
| [cloudflare_zero_trust_tunnel_cloudflared_route.private_network](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zero_trust_tunnel_cloudflared_route) | resource |
| [cloudflare_zone_setting.brotli](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zone_setting) | resource |
Expand All @@ -60,6 +59,6 @@ No inputs.
## Outputs

| Name | Description |
|------|-------------|
| ---- | ----------- |
| <a name="output_tunnel_ids"></a> [tunnel\_ids](#output\_tunnel\_ids) | Cloudflare Tunnel IDs for reference in kustomize-cluster ConfigMaps |
<!-- END_TF_DOCS -->
31 changes: 5 additions & 26 deletions cf-tunnels.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
# Cloudflare Tunnels for OpenShift workloads
# Tunnels connect cloudflared pods to Cloudflare edge network
# Cloudflare Tunnels — connect cloudflared pods to Cloudflare's edge.
#
# The cluster-apps tunnel is managed by cloudflare-operator in OpenShift.
# Tunnel credentials are managed in kustomize-cluster via SOPS/KSOPS.
# DNS records for app endpoints are managed by TunnelBinding resources in cluster.

# =============================================================================
# Consolidated HTTP Tunnel (managed by cloudflare-operator)
# =============================================================================

# Consolidated tunnel for all HTTP workloads
# Lifecycle managed by cloudflare-operator ClusterTunnel resource in OpenShift
# Import: tofu import cloudflare_zero_trust_tunnel_cloudflared.cluster_apps 03f750691b4ad4d59aa4b7205adaa108/1ac3a39c-7d97-422e-88e5-1f82b6334bbb
resource "cloudflare_zero_trust_tunnel_cloudflared" "cluster_apps" {
account_id = local.account_id
name = "cluster-apps"

lifecycle {
# Tunnel is managed by cloudflare-operator, prevent Terraform from modifying/deleting
ignore_changes = all
}
}

# =============================================================================
# WARP Connector (IP routing for Zero Trust VPN)
# =============================================================================
# The cluster-apps tunnel is created and owned by cloudflare-operator
# (see kustomize-cluster/operators/cloudflare/cluster-tunnel.yaml). Tunnel
# credentials live in the cluster's Secret. DNS records for app endpoints
# are reconciled by TunnelBinding resources, not managed here.

resource "cloudflare_zero_trust_tunnel_cloudflared" "warp" {
account_id = local.account_id
Expand Down
3 changes: 1 addition & 2 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
output "tunnel_ids" {
description = "Cloudflare Tunnel IDs for reference in kustomize-cluster ConfigMaps"
value = {
cluster_apps = cloudflare_zero_trust_tunnel_cloudflared.cluster_apps.id
warp = cloudflare_zero_trust_tunnel_cloudflared.warp.id
warp = cloudflare_zero_trust_tunnel_cloudflared.warp.id
}
}
Loading