mirror of
https://github.com/dredx/prole.git
synced 2026-09-23 10:13:58 +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>
99 lines
4.0 KiB
Makefile
99 lines
4.0 KiB
Makefile
# Makefile for Knoe Database Deployment and Installer
|
|
|
|
ifneq ($(wildcard bin/python3),)
|
|
PYTHON ?= bin/python3
|
|
else
|
|
PYTHON ?= python3
|
|
endif
|
|
PYINSTALLER = $(PYTHON) -m PyInstaller
|
|
DIST_DIR = dist
|
|
BUILD_DIR = build
|
|
KNOE_CONF ?= conf
|
|
KNOE_MODE ?= k3d
|
|
PIPELINE_DIR ?= deploy/opentofu/k3s
|
|
DEPLOYMENT_GIT_DIR ?= knoe/deployment
|
|
GITEA_SCRIPT ?= knoe/etc/gitea.sh
|
|
KUBECONFIG_PATH ?= $(CURDIR)/knoe-k3s.kubeconfig
|
|
DEPLOYMENT_REPO_URL ?= http://gitea.local/knoe/deployment.git
|
|
|
|
.PHONY: all knoe build build-auth install deploy init clean help requirements test pyconv start
|
|
|
|
all: build
|
|
|
|
start: build
|
|
open "$(DIST_DIR)/Knoe.DB Installer.app"
|
|
|
|
help:
|
|
@echo "Knoe Build & Deployment System"
|
|
@echo ""
|
|
@echo "Targets:"
|
|
@echo " knoe - Launch the Ncurses installer"
|
|
@echo " start - Build and launch the GUI installer"
|
|
@echo " install - Run silent install via install.sh"
|
|
@echo " deploy - Run infrastructure deployment via deploy.sh"
|
|
@echo " build - Build the 'knoe' CLI binary"
|
|
@echo " build-auth - Build the knoe-auth Spring Boot jar (authority/pom.xml)"
|
|
@echo " requirements - Install Python dependencies"
|
|
@echo " test - Run full test suite"
|
|
@echo " pyconv - Check Python code style conventions (black)"
|
|
@echo " clean - Remove build artifacts"
|
|
@echo ""
|
|
@echo "Environment:"
|
|
@echo " KNOE_CONF - Directory containing knoe.cfg (default: conf)"
|
|
|
|
requirements:
|
|
@echo "Installing dependencies..."
|
|
$(PYTHON) -m pip install -r requirements.txt
|
|
|
|
knoe:
|
|
./install.sh
|
|
|
|
build:
|
|
@$(PYTHON) -c "import PyInstaller" 2>/dev/null || (echo "Error: PyInstaller not found. Please run 'make requirements' or install it with: $(PYTHON) -m pip install -r requirements.txt" && exit 1)
|
|
@echo "Building 'Knoe.DB Installer' macOS App Bundle..."
|
|
$(PYINSTALLER) --clean --noconfirm knoe.spec
|
|
@echo "✓ Build complete: $(DIST_DIR)/Knoe.DB Installer.app"
|
|
|
|
build-auth:
|
|
@command -v mvn >/dev/null 2>&1 || (echo "Error: mvn not found in PATH." && exit 1)
|
|
@echo "Building knoe-auth (dev.knoe:auth) via authority/pom.xml..."
|
|
mvn -f authority/pom.xml -DskipTests package
|
|
@echo "✓ knoe-auth jar: authority/target/knoe-auth.jar"
|
|
|
|
install:
|
|
@echo "Running silent install..."
|
|
KNOE_CONF=$(KNOE_CONF) ./install.sh -s -c $(KNOE_CONF)/knoe.cfg
|
|
|
|
init:
|
|
@command -v tofu >/dev/null 2>&1 || (echo "Error: OpenTofu (tofu) not found in PATH." && exit 1)
|
|
@echo "Syncing OpenTofu pipeline from $(KNOE_MODE) runtime into $(PIPELINE_DIR)..."
|
|
@KNOE_MODE=$(KNOE_MODE) KNOE_CONF=$(KNOE_CONF) KNOE_GIT_REPO=$(DEPLOYMENT_REPO_URL) PYTHONPATH=$(CURDIR) $(PYTHON) -c "from knoe.core.controller import KnoeController; from knoe.core.env import PROJECT_ROOT; from knoe.deployment import KnoeDeployment; import sys, os; conf_dir = os.environ.get('KNOE_CONF', 'conf'); cfg_path = PROJECT_ROOT / conf_dir / 'knoe.cfg'; deployment = KnoeDeployment(KnoeController(PROJECT_ROOT, verbose=False, cfg_path=cfg_path), PROJECT_ROOT); ok = deployment.duplicate_k3d_to_k3s(); sys.exit(0 if ok else 1)"
|
|
@echo "Initializing OpenTofu backend in $(PIPELINE_DIR)..."
|
|
@cd $(PIPELINE_DIR) && tofu init
|
|
@echo "Staging pipeline sources into $(DEPLOYMENT_GIT_DIR) for Gitea"
|
|
@mkdir -p $(DEPLOYMENT_GIT_DIR)
|
|
@if command -v rsync >/dev/null 2>&1; then rsync -a $(PIPELINE_DIR)/ $(DEPLOYMENT_GIT_DIR)/; else cp -a $(PIPELINE_DIR)/. $(DEPLOYMENT_GIT_DIR)/; fi
|
|
@cd $(DEPLOYMENT_GIT_DIR) && if [ ! -d .git ]; then git init -q; fi
|
|
@echo "✓ init complete"
|
|
|
|
deploy:
|
|
@echo "Running Knoe deployment..."
|
|
./deploy.sh
|
|
|
|
test: pyconv
|
|
@echo "Running full test suite..."
|
|
@./tests/run_tests.sh
|
|
@echo ""
|
|
@echo "Test Summary:"
|
|
@$(PYTHON) -m coverage report | grep TOTAL | awk '{print "Total Coverage: " $$4 " (Statements: " $$2 ", Missed: " $$3 ")"}'
|
|
|
|
pyconv:
|
|
@echo "Checking Python code style conventions..."
|
|
@$(PYTHON) -m black --check . || (echo "Warning: pyconv (black) found style issues. Run 'black .' to fix." && exit 1)
|
|
|
|
clean:
|
|
@echo "Cleaning build artifacts..."
|
|
rm -rf $(BUILD_DIR) $(DIST_DIR) *.spec
|
|
rm -rf __pycache__ knoe/__pycache__
|
|
@echo "✓ Clean complete"
|