refactor(forte-drop): remove standalone subdomain cert+route
The forteapp chart now supports tls.additionalDomains (multi-SAN) and ingress.priority (forte-helm#10), so the per-slug wildcard cert and the low-priority HostRegexp IngressRoute no longer need to be standalone overlay resources. Routing + cert move to the forte-drop release values (helm-prod-values). The issuer dnsZones change stays here. Depends on forte-helm#10 (ingress.priority) merged + synced before the values flip, else the consolidated HostRegexp would outrank and steal mcp.drop.forteapps.net. Refs #22 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,39 +0,0 @@
|
|||||||
# Wildcard routing for per-slug forte drops: <slug>.drop.forteapps.net -> the forte-drop
|
|
||||||
# web pod. The forteapp chart only emits a single exact Host(`drop.forteapps.net`) route
|
|
||||||
# (the apex: admin + /api + public /shared drops), so this ADDITIVE IngressRoute adds the
|
|
||||||
# wildcard. Kept in launchpad (forte-drop-specific) rather than the shared forteapp chart.
|
|
||||||
#
|
|
||||||
# It targets the SAME service the chart's route does — forte-drop-app:3000 — whose
|
|
||||||
# targetPort is the auth sidecar (service.yaml: targetPort = auth.sidecarPort when auth is
|
|
||||||
# on). So wildcard subdomains flow service:3000 -> sidecar -> app, i.e. they are Forte-login
|
|
||||||
# gated exactly like the admin root. A forteOnly drop is therefore never served un-gated.
|
|
||||||
#
|
|
||||||
# priority: 1 (intentionally LOW). Traefik orders routers by rule-length by default, and the
|
|
||||||
# regex string is longer than Host(`mcp.drop.forteapps.net`); without an explicit low
|
|
||||||
# priority this regex would OUTRANK and STEAL mcp.drop.forteapps.net (and the apex) into the
|
|
||||||
# web pod. priority:1 guarantees the exact Host() routers (mcp release, chart apex) always win;
|
|
||||||
# only real per-slug subdomains fall through to here. The app's reserved-slug check
|
|
||||||
# (mcp/www/api/admin/app) is a second line of defence.
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: forte-drop-subdomains
|
|
||||||
namespace: forte-drop
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/name: forte-drop
|
|
||||||
app.kubernetes.io/part-of: apps
|
|
||||||
app.kubernetes.io/managed-by: argocd
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
# Traefik v3 (chart 28.x) HostRegexp takes a Go RE2 pattern. Verify the rendered
|
|
||||||
# router against mcp./www./app./apex/<real-slug> before relying on it in prod.
|
|
||||||
- match: HostRegexp(`^[a-z0-9-]+\.drop\.forteapps\.net$`)
|
|
||||||
kind: Rule
|
|
||||||
priority: 1
|
|
||||||
services:
|
|
||||||
- name: forte-drop-app
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
secretName: wildcard-drop-forteapps-net-tls
|
|
||||||
@@ -5,5 +5,3 @@ resources:
|
|||||||
- keycloak-client-forte-drop.yaml
|
- keycloak-client-forte-drop.yaml
|
||||||
- forte-drop-pdb.yaml
|
- forte-drop-pdb.yaml
|
||||||
- forte-drop-secrets-sealed.yaml
|
- forte-drop-secrets-sealed.yaml
|
||||||
- wildcard-drop-tls-certificate.yaml
|
|
||||||
- forte-drop-subdomains-ingressroute.yaml
|
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
---
|
|
||||||
# Wildcard TLS cert for the per-slug drop subdomains: <slug>.drop.forteapps.net.
|
|
||||||
# forte_drop serves forte-login drops on their own subdomain (gated by the auth
|
|
||||||
# sidecar), so each drop needs a valid cert for *.drop.forteapps.net — a name the
|
|
||||||
# existing *.forteapps.net wildcard CANNOT cover (TLS wildcards match one label only).
|
|
||||||
#
|
|
||||||
# Scope: this cert covers ONLY *.drop.forteapps.net. The apex drop.forteapps.net is
|
|
||||||
# NOT included here — it is served by the forteapp chart's own Certificate (secret
|
|
||||||
# forte-drop-tls, dnsNames: [drop.forteapps.net]) and/or the existing *.forteapps.net
|
|
||||||
# wildcard, so adding it here would be redundant.
|
|
||||||
#
|
|
||||||
# Issued DIRECTLY into the forte-drop namespace (not via the chart) so the app's
|
|
||||||
# Traefik IngressRoute — which must reference a TLS secret in its OWN namespace — can
|
|
||||||
# use it without cross-namespace cloning. This is the single issuer of secret
|
|
||||||
# wildcard-drop-forteapps-net-tls; the forte-drop-subdomains IngressRoute references
|
|
||||||
# that secret. The letsencrypt-prod dns01 solver is authorized for this name via its
|
|
||||||
# selector.dnsZones (forteapps.net).
|
|
||||||
apiVersion: cert-manager.io/v1
|
|
||||||
kind: Certificate
|
|
||||||
metadata:
|
|
||||||
name: wildcard-drop-forteapps-net
|
|
||||||
namespace: forte-drop
|
|
||||||
spec:
|
|
||||||
secretName: wildcard-drop-forteapps-net-tls
|
|
||||||
issuerRef:
|
|
||||||
name: letsencrypt-prod
|
|
||||||
kind: ClusterIssuer
|
|
||||||
dnsNames:
|
|
||||||
- '*.drop.forteapps.net' # per-slug forte drop subdomains
|
|
||||||
duration: 2160h0m0s # 90 days
|
|
||||||
renewBefore: 720h0m0s # renew 30 days before expiry
|
|
||||||
privateKey:
|
|
||||||
algorithm: RSA
|
|
||||||
encoding: PKCS1
|
|
||||||
size: 4096
|
|
||||||
Reference in New Issue
Block a user