mirror of
https://github.com/dredx/prole.git
synced 2026-09-24 15:54:32 +00:00
Bringing the long-running session-feature branch back into main in one deliberate sweep. The branch carried the cluster work that's been live for weeks (cross-cluster CNPG metrics, Grafana w/ Google OAuth, supabase oauth2-proxy, cluster recovery, pg.0.knoe.dev + per-engineer onboarding, GCS-backed CNPG backups via Workload Identity, the env-contamination guard, the Junie brief queue, the cnpg-grafana CSRF + memory-request fixes from today), while main accumulated Junie's parallel knoe-auth Phase 2 OIDC work (full provider surface: discovery, authorize, token, userinfo, JWKS, RS256 signing, code exchange, session services). Key decision: the two branches did COMPETING rebrands off the same starting point (5ba9b63, 2026-04-27): - claude branch (commit b355855, earlier): org.prole.authority.* → dev.knoe.auth.* (artifact renamed to knoe-auth.jar) - main (commit9daa94b, recent): org.prole.authority.* → dev.knoe.authority.* (kept "authority" artifact name) dev.knoe.auth wins: cluster runs from this name, the Maven artifact is already knoe-auth.jar, and the broader rename is the documented namespace direction (per ~/.claude/projects/-Users-chrisfu-dev-knoe-db/ memory/MEMORY.md). All of main's recent Phase 2 OIDC content was ported from authority/src/.../dev/knoe/authority/ into authority/src/.../dev/knoe/auth/ with package declarations rewritten. == File-level resolution summary == Textual conflicts (4): authority/pom.xml - Took our artifactId="auth" - Took our branch's removal of spring-security-kerberos-client (verified: Junie's Phase 2 OIDC code does not import it; the dep was already-dead config) docs/pipeline-phases.md - Took our branch's "Phase 1 not started" status. Main had a misplaced "✅ Complete" with a knoe-auth-Phase-1 commit ref in the autobuild Phase 1 section — different domain. docs/plans/knoe-auth-round-1.md - Took our branch's dev.knoe.auth file table (vs main's dev.knoe.authority listing). Pure rename mismatch. supabase/helm/knoe-supabase/templates/kong/config.yaml - Took our branch's onboard route + plain dashboard wiring. Main had an oauth2proxy.enabled toggle that put oauth2-proxy as a Kong upstream — but the deployed architecture (commit 25f1b2e) has oauth2-proxy in FRONT of Kong, not behind. Main's wrapper reflected an architecture that was never deployed. - Took our branch's removal of basic-auth from dashboard route (queue #15 brief still tracks the matching values.yaml / kong/deployment.yaml cleanup). Java tree reconciliation (44 file-pairs): 20 dual-path source files + 2 dual-path tests Body-identical between main's authority/ and our branch's auth/ after stripping package decls — main's commit9daa94bwas a pure rebrand. Took our branch's auth/ version for all 22. 8 main-only source files (Phase 2 OIDC), ported into auth/: web/JwksController.java web/OidcAuthorizeController.java web/OidcDiscoveryController.java web/OidcTokenController.java web/OidcUserInfoController.java session/OidcCodeService.java session/OidcTokenService.java session/SessionService.java 12 main-only test files, ported into auth/: HealthControllerTest.java enroll/EnrollValueTypesTest.java enroll/EnrollmentControllerTest.java enroll/TotpServiceTest.java kerberos/KadminClientTest.java kerberos/KerberosSpnegoResultTest.java web/LoginControllerTest.java admin/AdminControllerTest.java user/PrincipalNormalizerTest.java regression/IdentityRegressionTest.java session/OidcCodeServiceTest.java session/SessionServiceTest.java Port mechanics: read main:authority/...<file> via git show, then sed rewrite `package dev.knoe.authority` → `package dev.knoe.auth` and `import dev.knoe.authority` → `import dev.knoe.auth`. Body content unchanged. authority/src/main/java/dev/knoe/authority/ — DELETED (duplicate) authority/src/test/java/dev/knoe/authority/ — DELETED (duplicate) == Verification == - grep -rln '<<<<<<<' across .java/.md/.yaml/.yml/.sh/.xml/.tpl: clean - find authority/src -path '*/dev/knoe/authority*': empty (subtree gone) - grep 'package dev.knoe.authority' across repo: clean - bash -n install.sh deploy.sh etc/preflight_kubecontext.sh: clean - git ls-files -u | wc -l: 0 unmerged paths - helm lint supabase/helm/knoe-supabase: pre-existing failure on studioIngress.enabled undefined in values.yaml (introduced by Junie on main; unrelated to this merge — flagging as follow-up). == Followups (carried into TODO ranked queue or noted here) == - helm lint failure: studioIngress block in values.yaml is missing enable flag; templates/studio/{ingress,oauth2proxy-deployment, oauth2proxy-service}.yaml all reference studioIngress.enabled with no default. Pre-existing on main; not introduced by this merge. - The five Junie briefs filed on this branch are now reachable from main at docs/plans/junie/{02,06,07,13,15}-*.md. Junie can pick them up in any order. - knoe-auth Phase 2 OIDC source (now at dev.knoe.auth.*) is not yet deployed to the cluster. Deployment is its own task. - The branch claude/crazy-bose-fec256 stays in place (worktree at .claude/worktrees/crazy-bose-fec256 may have ongoing context for Claude Code sessions). Safe to delete once next session starts cleanly from main. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
268 lines
9.9 KiB
YAML
268 lines
9.9 KiB
YAML
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: knoe-auth
|
|
labels:
|
|
app: knoe-auth
|
|
spec:
|
|
replicas: 1
|
|
selector:
|
|
matchLabels:
|
|
app: knoe-auth
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: knoe-auth
|
|
spec:
|
|
initContainers:
|
|
- name: keytab-bootstrap
|
|
image: myrddin.prole.org:5000/knoe-authority:latest
|
|
imagePullPolicy: IfNotPresent
|
|
command:
|
|
- /bin/bash
|
|
- -lc
|
|
- |
|
|
set -euo pipefail
|
|
export DEBIAN_FRONTEND=noninteractive
|
|
|
|
realm="${PROLE_KDC_REALM:-PROLE.ORG}"
|
|
admin_principal="${PROLE_KDC_ADMIN_PRINCIPAL:-admin/admin}"
|
|
if [[ "${admin_principal}" != *"@"* ]]; then
|
|
admin_principal="${admin_principal}@${realm}"
|
|
fi
|
|
|
|
svc_principal="${PROLE_KERBEROS_SERVICE_PRINCIPAL:?Missing PROLE_KERBEROS_SERVICE_PRINCIPAL}"
|
|
if [[ "${svc_principal}" != *"@"* ]]; then
|
|
svc_principal="${svc_principal}@${realm}"
|
|
fi
|
|
|
|
keytab_out="/etc/knoe/keytabs/http.keytab"
|
|
mkdir -p "$(dirname "${keytab_out}")"
|
|
|
|
if [[ -f /mnt/keytab-secret/http.keytab ]]; then
|
|
cp /mnt/keytab-secret/http.keytab "${keytab_out}"
|
|
chmod 0400 "${keytab_out}" || true
|
|
exit 0
|
|
fi
|
|
|
|
if ! command -v kadmin.local >/dev/null 2>&1; then
|
|
echo "Installing Kerberos packages..."
|
|
echo "krb5-config krb5-config/default_realm string ${realm}" | debconf-set-selections || true
|
|
echo "krb5-config krb5-config/kerberos_servers string 127.0.0.1" | debconf-set-selections || true
|
|
echo "krb5-config krb5-config/admin_server string 127.0.0.1" | debconf-set-selections || true
|
|
apt-get update
|
|
apt-get install -y --no-install-recommends krb5-kdc krb5-admin-server krb5-user dnsutils ca-certificates
|
|
rm -rf /var/lib/apt/lists/*
|
|
fi
|
|
|
|
mkdir -p /etc/krb5kdc /var/lib/krb5kdc
|
|
if [[ -f /opt/knoe-kdc/krb5.conf ]]; then
|
|
cp /opt/knoe-kdc/krb5.conf /etc/krb5.conf
|
|
fi
|
|
if [[ -f /opt/knoe-kdc/kdc.conf ]]; then
|
|
cp /opt/knoe-kdc/kdc.conf /etc/krb5kdc/kdc.conf
|
|
fi
|
|
if [[ -f /opt/knoe-kdc/kadm5.acl ]]; then
|
|
cp /opt/knoe-kdc/kadm5.acl /etc/krb5kdc/kadm5.acl
|
|
fi
|
|
|
|
if [[ -z "${PROLE_KDC_MASTER_PASSWORD:-}" ]]; then
|
|
echo "ERROR: Missing required env PROLE_KDC_MASTER_PASSWORD (secret 'knoe-kdc-secrets/master_password')." >&2
|
|
exit 1
|
|
fi
|
|
if [[ -z "${PROLE_KDC_ADMIN_PASSWORD:-}" ]]; then
|
|
echo "ERROR: Missing required env PROLE_KDC_ADMIN_PASSWORD (secret 'knoe-kdc-secrets/admin_password')." >&2
|
|
exit 1
|
|
fi
|
|
|
|
if [[ ! -f /var/lib/krb5kdc/principal ]]; then
|
|
echo "Initializing realm database for ${realm}..."
|
|
kdb5_util create -s -r "${realm}" -P "${PROLE_KDC_MASTER_PASSWORD}"
|
|
fi
|
|
|
|
if ! kadmin.local -q "get_principal ${admin_principal}" >/dev/null 2>&1; then
|
|
echo "Creating admin principal ${admin_principal}..."
|
|
kadmin.local -q "addprinc -pw ${PROLE_KDC_ADMIN_PASSWORD} ${admin_principal}"
|
|
fi
|
|
|
|
if ! kadmin.local -q "get_principal ${svc_principal}" >/dev/null 2>&1; then
|
|
echo "Creating service principal ${svc_principal}..."
|
|
kadmin.local -q "addprinc -randkey ${svc_principal}"
|
|
fi
|
|
|
|
kadmin.local -q "ktadd -k ${keytab_out} -norandkey ${svc_principal}"
|
|
chmod 0400 "${keytab_out}" || true
|
|
env:
|
|
- name: PROLE_KDC_REALM
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-auth-kerberos
|
|
key: realm
|
|
- name: PROLE_KDC_ADMIN_PRINCIPAL
|
|
value: "admin/admin"
|
|
- name: PROLE_KDC_MASTER_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-kdc-secrets
|
|
key: master_password
|
|
- name: PROLE_KDC_ADMIN_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-kdc-secrets
|
|
key: admin_password
|
|
- name: PROLE_KERBEROS_SERVICE_PRINCIPAL
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-auth-kerberos
|
|
key: servicePrincipal
|
|
volumeMounts:
|
|
- name: keytab
|
|
mountPath: /etc/knoe/keytabs
|
|
- name: keytab-secret
|
|
mountPath: /mnt/keytab-secret
|
|
readOnly: true
|
|
- name: knoe-kdc-config
|
|
mountPath: /opt/knoe-kdc
|
|
- name: knoe-kdc-data
|
|
mountPath: /var/lib/krb5kdc
|
|
- name: knoe-kdc-data
|
|
mountPath: /etc/krb5kdc
|
|
containers:
|
|
- name: knoe-auth
|
|
image: knoe-auth:latest
|
|
ports:
|
|
- containerPort: 8080
|
|
name: http
|
|
env:
|
|
- name: PROLE_AUTH_ENABLED
|
|
value: "true"
|
|
- name: PROLE_AUTH_COOKIE_DOMAIN
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-platform-config
|
|
key: authCookieDomain
|
|
optional: true
|
|
- name: PROLE_AUTH_SESSION_SECRET
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-auth-secrets
|
|
key: sessionSecret
|
|
- name: PROLE_KERBEROS_SERVICE_PRINCIPAL
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-auth-kerberos
|
|
key: servicePrincipal
|
|
- name: PROLE_KERBEROS_KEYTAB_PATH
|
|
value: "/etc/knoe/keytabs/http.keytab"
|
|
- name: PROLE_KERBEROS_REALM
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-auth-kerberos
|
|
key: realm
|
|
# ── Google Workspace OIDC (primary auth for GKE/prod) ──────────
|
|
# Secret created by installer from Auth+Routing tab OIDC fields.
|
|
# Template: deploy/gcp/gke/knoe-auth-google-oidc-secret.example.yaml
|
|
- name: GOOGLE_OIDC_ENABLED
|
|
value: "true"
|
|
- name: GOOGLE_CLIENT_ID
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-auth-google-oidc
|
|
key: client_id
|
|
optional: true # Kerberos-only deployments can omit this secret
|
|
- name: GOOGLE_CLIENT_SECRET
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-auth-google-oidc
|
|
key: client_secret
|
|
optional: true
|
|
- name: GOOGLE_HOSTED_DOMAIN
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-auth-google-oidc
|
|
key: hosted_domain
|
|
optional: true # blank = any Google account; set to restrict to Workspace domain
|
|
- name: OIDC_ISSUER_URL
|
|
value: "https://knoe-auth.knoe-system.svc.cluster.local:8080"
|
|
- name: OIDC_BASE_URL
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-platform-config
|
|
key: frontdoorHost
|
|
optional: true
|
|
# Comma-separated list of bare usernames granted admin group in OIDC tokens
|
|
- name: PROLE_AUTH_ADMIN_PRINCIPALS
|
|
value: "admin"
|
|
volumeMounts:
|
|
- name: keytab
|
|
mountPath: /etc/knoe/keytabs
|
|
readOnly: true
|
|
- name: knoe-kdc-config
|
|
mountPath: /etc/krb5.conf
|
|
subPath: krb5.conf
|
|
readOnly: true
|
|
- name: kdc
|
|
image: myrddin.prole.org:5000/knoe-authority:latest
|
|
imagePullPolicy: IfNotPresent
|
|
command: ["/bin/bash", "/opt/knoe-kdc/entrypoint.sh"]
|
|
env:
|
|
- name: PROLE_KDC_REALM
|
|
valueFrom:
|
|
configMapKeyRef:
|
|
name: knoe-auth-kerberos
|
|
key: realm
|
|
- name: PROLE_KDC_ADMIN_PRINCIPAL
|
|
value: "admin/admin"
|
|
- name: PROLE_KDC_MASTER_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-kdc-secrets
|
|
key: master_password
|
|
- name: PROLE_KDC_ADMIN_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-kdc-secrets
|
|
key: admin_password
|
|
- name: PROLE_KDC_GUEST_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: knoe-kdc-secrets
|
|
key: guest_password
|
|
optional: true # auto-generated by init_knoe_users.sh if absent
|
|
ports:
|
|
- name: krb5-udp
|
|
containerPort: 88
|
|
protocol: UDP
|
|
- name: krb5-tcp
|
|
containerPort: 88
|
|
protocol: TCP
|
|
- name: kpasswd-udp
|
|
containerPort: 464
|
|
protocol: UDP
|
|
- name: kpasswd-tcp
|
|
containerPort: 464
|
|
protocol: TCP
|
|
- name: kadmin
|
|
containerPort: 749
|
|
protocol: TCP
|
|
volumeMounts:
|
|
- name: knoe-kdc-config
|
|
mountPath: /opt/knoe-kdc
|
|
- name: knoe-kdc-data
|
|
mountPath: /var/lib/krb5kdc
|
|
- name: knoe-kdc-data
|
|
mountPath: /etc/krb5kdc
|
|
volumes:
|
|
- name: keytab
|
|
emptyDir: {}
|
|
- name: keytab-secret
|
|
secret:
|
|
secretName: knoe-auth-keytab
|
|
optional: true
|
|
- name: knoe-kdc-config
|
|
configMap:
|
|
name: knoe-kdc-config
|
|
defaultMode: 0755
|
|
- name: knoe-kdc-data
|
|
emptyDir: {}
|