Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| df30877b5e | |||
| 9297398d56 | |||
| b0804e1e6a | |||
| 8216399155 |
@@ -0,0 +1,20 @@
|
|||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Install TruffleHog
|
||||||
|
run: |
|
||||||
|
curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh \
|
||||||
|
| sh -s -- -b /usr/local/bin
|
||||||
|
- name: Secret Scanning
|
||||||
|
run: trufflehog git file://. --fail --no-update --results=verified,unknown
|
||||||
@@ -77,6 +77,12 @@ spec:
|
|||||||
mc rm --recursive --force --older-than 30d "obj/${S3_BUCKET}/_pgbackups/" || true
|
mc rm --recursive --force --older-than 30d "obj/${S3_BUCKET}/_pgbackups/" || true
|
||||||
echo "backup retention pass complete"
|
echo "backup retention pass complete"
|
||||||
env:
|
env:
|
||||||
|
# mc writes its config under $MC_CONFIG_DIR; point it at the shared
|
||||||
|
# emptyDir (writable by uid 65532 via fsGroup). Without this it tries
|
||||||
|
# to mkdir /.mc on the read-only-to-nonroot root fs -> "mkdir /.mc:
|
||||||
|
# permission denied" and every run fails before uploading.
|
||||||
|
- name: MC_CONFIG_DIR
|
||||||
|
value: "/work/.mc"
|
||||||
- name: S3_ENDPOINT
|
- name: S3_ENDPOINT
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef: { name: forte-drop-secrets, key: S3_ENDPOINT }
|
secretKeyRef: { name: forte-drop-secrets, key: S3_ENDPOINT }
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -1,8 +1,3 @@
|
|||||||
# Labeled config Secret read by the Keycloak Client Registrar. Kyverno clones it
|
|
||||||
# to the keycloak namespace; a CronJob registers the OIDC client in the forte
|
|
||||||
# realm and writes the credentials back as forte-drop-oidc-credentials in THIS
|
|
||||||
# namespace (~2 min). The forte-helm auth sidecar (auth.type: oidc) consumes that
|
|
||||||
# registrar-created Secret automatically — no manual SealedSecret step needed.
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -24,15 +24,8 @@ spec:
|
|||||||
name: azuredns-config
|
name: azuredns-config
|
||||||
key: client-secret
|
key: client-secret
|
||||||
selector:
|
selector:
|
||||||
# NOTE: cert-manager solver selectors are NOT TLS-style wildcards. selector.dnsNames
|
dnsNames:
|
||||||
# matches by exact FQDN, so '*.forteapps.net' here would match only a cert literally
|
- '*.forteapps.net'
|
||||||
# named '*.forteapps.net' — it would NOT cover 'drop.forteapps.net'. selector.dnsZones
|
|
||||||
# instead suffix-matches the zone apex AND every subdomain at any depth, so this single
|
|
||||||
# entry routes all forteapps.net ACME challenges (forteapps.net, *.forteapps.net,
|
|
||||||
# drop.forteapps.net, *.drop.forteapps.net, mcp.drop.forteapps.net, ...) through this
|
|
||||||
# Azure dns01 solver. Wildcard names require dns01; non-wildcard names that ever fail
|
|
||||||
# to match fall through to the http01 solver below.
|
|
||||||
dnsZones:
|
|
||||||
- 'forteapps.net'
|
- 'forteapps.net'
|
||||||
# HTTP-01 fallback for non-wildcard certificates
|
# HTTP-01 fallback for non-wildcard certificates
|
||||||
- http01:
|
- http01:
|
||||||
@@ -65,15 +58,8 @@ spec:
|
|||||||
name: azuredns-config
|
name: azuredns-config
|
||||||
key: client-secret
|
key: client-secret
|
||||||
selector:
|
selector:
|
||||||
# NOTE: cert-manager solver selectors are NOT TLS-style wildcards. selector.dnsNames
|
dnsNames:
|
||||||
# matches by exact FQDN, so '*.forteapps.net' here would match only a cert literally
|
- '*.forteapps.net'
|
||||||
# named '*.forteapps.net' — it would NOT cover 'drop.forteapps.net'. selector.dnsZones
|
|
||||||
# instead suffix-matches the zone apex AND every subdomain at any depth, so this single
|
|
||||||
# entry routes all forteapps.net ACME challenges (forteapps.net, *.forteapps.net,
|
|
||||||
# drop.forteapps.net, *.drop.forteapps.net, mcp.drop.forteapps.net, ...) through this
|
|
||||||
# Azure dns01 solver. Wildcard names require dns01; non-wildcard names that ever fail
|
|
||||||
# to match fall through to the http01 solver below.
|
|
||||||
dnsZones:
|
|
||||||
- 'forteapps.net'
|
- 'forteapps.net'
|
||||||
# HTTP-01 fallback for non-wildcard certificates
|
# HTTP-01 fallback for non-wildcard certificates
|
||||||
- http01:
|
- http01:
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ spec:
|
|||||||
sources:
|
sources:
|
||||||
- repoURL: https://dl.gitea.com/charts
|
- repoURL: https://dl.gitea.com/charts
|
||||||
chart: gitea
|
chart: gitea
|
||||||
targetRevision: "12.5.0"
|
targetRevision: "12.6.0"
|
||||||
helm:
|
helm:
|
||||||
releaseName: gitea
|
releaseName: gitea
|
||||||
valueFiles:
|
valueFiles:
|
||||||
|
|||||||
Reference in New Issue
Block a user