mirror of
https://github.com/dredx/prole.git
synced 2026-09-23 10:13:58 +00:00
00f0ebec07
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>
63 lines
2.3 KiB
Bash
63 lines
2.3 KiB
Bash
#!/usr/bin/env bash
|
|
# Simulates EXACTLY what milestones.py + controller.run_script does
|
|
# when calling init_gitlab.sh — replicates the full env context.
|
|
set -euo pipefail
|
|
|
|
CFG="/Users/chrisfu/dev/knoe/conf/service/knoe.cfg"
|
|
KNOE_HOME="/Users/chrisfu/dev/knoe"
|
|
|
|
echo "=== Simulating installer env context ==="
|
|
|
|
# Replicate _get_script_env (milestone.py lines 81-87)
|
|
# base_env = os.environ.copy() + updates
|
|
export KNOE_HOME="$KNOE_HOME"
|
|
export KNOE_SERVICE="$KNOE_HOME/etc"
|
|
export KNOE_CONF="$KNOE_HOME/conf/service"
|
|
export PROLE_DATA="$KNOE_HOME/knoe-db/data"
|
|
export PROLE_LOGS="$KNOE_HOME/logs"
|
|
export KNOE_MODE="k3s"
|
|
export DEPLOYMENT_MODE="k3s"
|
|
export NAMESPACE="knoe-db" # milestone.py line 86: init_password.db_namespace
|
|
export PROLE_NAMESPACE="knoe-db"
|
|
export DATABASE_NAMESPACE="knoe-db"
|
|
export SERVICE_NAMESPACE="knoe-system"
|
|
export CLUSTER_NAME="knoe-db"
|
|
|
|
# Replicate milestones.py GitOpsMilestone.execute() lines 965-977
|
|
export GITLAB_NAMESPACE="gitlab" # line 971: env["GITLAB_NAMESPACE"] = ns (ns="gitlab")
|
|
export GITLAB_NODE_SELECTOR="gandalf.prole.org" # line 976
|
|
export NODE_SELECTOR="gandalf.prole.org" # line 977
|
|
|
|
echo " Pre-call env: NAMESPACE='$NAMESPACE' GITLAB_NAMESPACE='$GITLAB_NAMESPACE'"
|
|
echo ""
|
|
|
|
# Now call init_gitlab.sh with same args milestones.py builds:
|
|
# args = ["--mode", "k3s", "--namespace", ns, "-c", cfg_path]
|
|
echo "=== Calling init_gitlab.sh --trace-namespace (exits after namespace resolution) ==="
|
|
OUTPUT=$(bash "$KNOE_HOME/etc/init_gitlab.sh" \
|
|
--mode k3s \
|
|
--namespace gitlab \
|
|
-c "$CFG" \
|
|
--trace-namespace 2>&1 || true)
|
|
echo "$OUTPUT" | head -5
|
|
|
|
# Now test WITHOUT --namespace arg (worst-case: arg not passed)
|
|
echo ""
|
|
echo "=== Worst case: no --namespace arg (relies on env + default) ==="
|
|
OUTPUT2=$(bash "$KNOE_HOME/etc/init_gitlab.sh" \
|
|
--mode k3s \
|
|
-c "$CFG" \
|
|
--trace-namespace 2>&1 || true)
|
|
echo "$OUTPUT2" | head -5
|
|
|
|
# Also verify what knoe_cfg.sh does to NAMESPACE
|
|
echo ""
|
|
echo "=== Check: does knoe_cfg.sh overwrite NAMESPACE? ==="
|
|
(
|
|
export NAMESPACE="gitlab"
|
|
source "$KNOE_HOME/etc/knoe_cfg.sh" 2>/dev/null || true
|
|
echo " NAMESPACE after sourcing knoe_cfg.sh: '${NAMESPACE:-<unset>}'"
|
|
echo " GITOPS_NAMESPACE: '${GITOPS_NAMESPACE:-<unset>}'"
|
|
echo " GITLAB_NAMESPACE: '${GITLAB_NAMESPACE:-<unset>}'"
|
|
)
|