mirror of
https://github.com/dredx/prole.git
synced 2026-09-23 10:13:58 +00:00
Merge claude/crazy-bose-fec256 into main
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>
This commit is contained in:
parent
500c9b1317
commit
00f0ebec07
4
.gitignore
vendored
4
.gitignore
vendored
@ -70,6 +70,7 @@ mssql-password*
|
||||
knoe-db/data/
|
||||
var/
|
||||
/target/
|
||||
**/target/
|
||||
/pyvenv.cfg
|
||||
.output.txt
|
||||
deploy/gcp/terraform-setup.txt
|
||||
@ -109,9 +110,6 @@ htmlcov/
|
||||
|
||||
/ssh-keys/
|
||||
/mock_val/secrets/
|
||||
/mock_val/secrets/
|
||||
/prole-auth/target/surefire-reports/org.prole.auth.session.SessionTokenServiceTest.txt
|
||||
/prole-auth/target/surefire-reports/org.prole.auth.web.VerifyControllerTest.txt
|
||||
/prole-db.iml
|
||||
supabase/helm/generated/values.generated.json
|
||||
/.claude/
|
||||
|
||||
15
AGENTS.md
15
AGENTS.md
@ -13,9 +13,9 @@ Two GKE clusters in `us-west3`:
|
||||
| Cluster | Context | Purpose |
|
||||
|---|---|---|
|
||||
| `knoe-dev-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-dev-0` | App cluster — Garage, Registry, OpenBao, Kong, GitLab, monitoring |
|
||||
| `knoe-cnpg-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0` | DB cluster — CNPG/PostgreSQL only |
|
||||
| `knoe-dev-cnpg-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0` | DB cluster — CNPG/PostgreSQL only |
|
||||
|
||||
**Critical:** Garage must NEVER be deployed to `knoe-cnpg-0`. SSD quota (300 GB) is fully consumed by CNPG — all non-CNPG PVCs must use `standard` storage class (HDD), not `standard-rwo`/`premium-rwo`.
|
||||
**Critical:** SSD quota (300 GB) is fully consumed by CNPG — all non-CNPG PVCs must use `standard` storage class (HDD), not `standard-rwo`/`premium-rwo`. **Garage runs ONLY on `knoe-dev-0`** (removed from DB cluster on 2026-04-29).
|
||||
|
||||
### Deployment environments / modes
|
||||
| `cluster_env` | `KNOE_MODE` | Target |
|
||||
@ -110,8 +110,13 @@ Missing `init_cluster.app_cluster_kubecontext` in config causes Garage to deploy
|
||||
|
||||
## CNPG / backup specifics
|
||||
|
||||
- CNPG backups go to **GCS** (not Garage): `gs://knoe-0-backups/` and `gs://knoe-0-wal/`
|
||||
- Workload Identity SA: `cnpg-backup@plenary-truck-485623-p7.iam.gserviceaccount.com`
|
||||
- ObjectStore manifest: `k8s/knoe/knoe-db-barman-objectstore-gcs.yaml`
|
||||
- CNPG backups go to **GCS**: `gs://knoe-0-backups/` (single bucket; `knoe-db/base/` and `knoe-db/wals/` prefixes). `gs://knoe-0-wal/` exists but is unused.
|
||||
- CNPG operator: **v1.29.0** (upgraded 2026-04-29 to expose `spec.serviceAccountName`)
|
||||
- plugin-barman-cloud: v0.12.0
|
||||
- GCP SA: `cnpg-backup@plenary-truck-485623-p7.iam.gserviceaccount.com` (`storage.objectAdmin` + `storage.legacyBucketReader` on the bucket)
|
||||
- K8s SA: cluster pods run as **`cnpg-backup-sa`** in `knoe-db-0`, set via `cluster.spec.serviceAccountName: cnpg-backup-sa`. The SA has the `iam.gke.io/gcp-service-account` annotation. RoleBindings `knoe-db` and `knoe-db-barman-cloud` include `cnpg-backup-sa` as a subject so the pod has the same RBAC the auto-generated SA would have had.
|
||||
- ObjectStore manifest: `k8s/knoe/knoe-db-barman-objectstore-gcs.yaml` — includes `googleCredentials.gkeEnvironment: true`
|
||||
- Setup: `etc/init_cnpg_gke.sh` and `etc/init_cnpg_backup.sh`
|
||||
|
||||
> **Performance note:** Pod `memory: 512Mi` makes `barman-cloud-backup` runs 30–90 min for the 9 GB DB. Bump pending in [`docs/TODO.md`](docs/TODO.md).
|
||||
|
||||
|
||||
82
CLAUDE.md
82
CLAUDE.md
@ -4,29 +4,34 @@
|
||||
|
||||
---
|
||||
|
||||
## Repo role: customer deploy of `knoe-db`
|
||||
## Repo role: knoe-db platform repo
|
||||
|
||||
This working tree (`prole`) is being converged into a **customer-deploy branch** of the upstream platform repo `knoe-db` (remote: `git@git-ssh.knoe.dev:knoe.dev/knoe-db.git`, configured here as the `knoe` remote). Platform code — `authority/`, `knoe/`, `etc/init_*.sh`, `deploy/gcp/gke/*`, the test pipeline — is not maintained in this repo; its source of truth is `knoe-db/main`. Customer-specific divergence (config, branding, on-prem `prole.org` manifests) is what stays on the customer branch.
|
||||
This is `knoe-db` (remote: `git@git-ssh.knoe.dev:knoe.dev/knoe-db.git`, configured as both `origin` and `knoe`). It's the platform's source of truth — `authority/`, `knoe/`, `etc/init_*.sh`, `deploy/gcp/gke/*`, the test pipeline, all live here.
|
||||
|
||||
**Before changing anything in this tree, check whether the change belongs upstream.** If it's platform code, land it on `knoe-db/main` and rebase the customer branch.
|
||||
Customer deploys are intended to live as **branches** in this repo (e.g. a future `customer/prole.org`), not as separate forks. As of this writing, no customer branch is active — the prole→knoe rebrand has merged into `main` and there is no separate `~/dev/prole` working tree under development. See [`docs/plans/customer-deploy-resync.md`](docs/plans/customer-deploy-resync.md) for the original plan, currently dormant.
|
||||
|
||||
## Master TODO
|
||||
|
||||
Single source of truth for unfinished work, including the reality-vs-intent gaps flagged below: **[`docs/TODO.md`](docs/TODO.md)**.
|
||||
|
||||
## Active plans
|
||||
|
||||
- [`docs/plans/customer-deploy-resync.md`](docs/plans/customer-deploy-resync.md) — The active plan for converging `prole` onto `knoe-db/main` as a customer-deploy branch. Inventory + cherry-pick + rebase cadence. **Read this first** if you are about to touch anything in this tree.
|
||||
- [`docs/plans/README.md`](docs/plans/README.md) — Index and conventions for this directory.
|
||||
|
||||
For platform-level plans (knoe-auth, deployment modes, etc.), read [`knoe-db/docs/plans/`](../knoe-db/docs/plans/) (path relative to your `~/dev/` root). Those documents are the architectural reference for the shipped platform features and are versioned with the upstream code, not here.
|
||||
- [`docs/plans/knoe-auth-round-1.md`](docs/plans/knoe-auth-round-1.md) — Identity backbone (Kerberos KDC + invite-OTP + TOTP). **Shipped.**
|
||||
- [`docs/plans/deployment-modes.md`](docs/plans/deployment-modes.md) — Four installer modes (`min` / `k3d` / `k3s` / `gke`). **Shipped (Phase 0).**
|
||||
- [`docs/pipeline-phases.md`](docs/pipeline-phases.md) — Autobuild & test pipeline phase reference. Phase 0 ✅, Phase 1 next (first task: f-string fix at `knoe/core/ops/cloudnative_pg.py:1372`).
|
||||
- [`docs/plans/customer-deploy-resync.md`](docs/plans/customer-deploy-resync.md) — The original plan to converge `~/dev/prole` onto `knoe-db/main` as a customer-deploy branch. **Dormant** (rebrand is now in main, no separate prole tree active).
|
||||
|
||||
---
|
||||
|
||||
## Dual-cluster GKE architecture
|
||||
|
||||
This project uses **two separate GKE Standard clusters** in `us-west3`, both currently provisioned with `e2-standard-2` × 3 nodes (2 vCPU / 8 GB each, ~7.1 GB allocatable). Verify with `gcloud container clusters list` — `knoe/core/actions.py` still carries an `e2-small` default for the app cluster but the live cluster is `e2-standard-2`.
|
||||
This project uses **two separate GKE Standard clusters** in `us-west3`, both currently provisioned with `e2-standard-2` × 3 nodes (2 vCPU / 8 GB each, ~7.1 GB allocatable). Verify with `gcloud container clusters list`.
|
||||
|
||||
| Cluster | Context | Role |
|
||||
|---|---|---|
|
||||
| `knoe-dev-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-dev-0` | App cluster — Garage, registry, OpenBao, Kong, GitLab, monitoring |
|
||||
| `knoe-cnpg-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0` | DB cluster — CNPG/PostgreSQL only (note: `conf/gke.cfg` currently deploys this as `knoe-dev-cnpg-0`; the code default remains `knoe-cnpg-0`) |
|
||||
| `knoe-dev-cnpg-0` | `gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0` | DB cluster — CNPG/PostgreSQL only |
|
||||
|
||||
**Storage quota:** the project has `SSD_TOTAL_GB = 300 GB` in `us-west3`, **fully consumed by CNPG**. All non-CNPG PVCs must use `standard` (pd-standard / HDD) — not `standard-rwo` / `premium-rwo`, which are SSD-backed and will fail to provision with a quota error. `GITLAB_GITALY_STORAGE_CLASS = standard` is set in `conf/gke.cfg` accordingly.
|
||||
|
||||
@ -34,28 +39,28 @@ This project uses **two separate GKE Standard clusters** in `us-west3`, both cur
|
||||
|
||||
| Resource | Cluster | Namespace |
|
||||
|---|---|---|
|
||||
| CNPG operator | `knoe-cnpg-0` | `cnpg-system` |
|
||||
| PostgreSQL cluster (`knoe-db`) | `knoe-cnpg-0` | `knoe-db-0` |
|
||||
| Barman Cloud plugin | `knoe-cnpg-0` | `cnpg-system` |
|
||||
| cert-manager | `knoe-cnpg-0` | `cert-manager` |
|
||||
| CNPG operator (v1.29.0) | `knoe-dev-cnpg-0` | `cnpg-system` |
|
||||
| PostgreSQL cluster (`knoe-db`) | `knoe-dev-cnpg-0` | `knoe-db-0` |
|
||||
| Barman Cloud plugin (v0.12.0) | `knoe-dev-cnpg-0` | `cnpg-system` |
|
||||
| cert-manager | `knoe-dev-cnpg-0` | `cert-manager` |
|
||||
| Garage (S3 object store) | `knoe-dev-0` | `knoe-system` |
|
||||
| Registry | `knoe-dev-0` | `knoe-system` |
|
||||
| OpenBao | `knoe-dev-0` | `knoe-system` |
|
||||
| Kong API gateway | `knoe-dev-0` | `knoe-system` |
|
||||
| Monitoring | `knoe-dev-0` | `monitoring` |
|
||||
|
||||
**Garage runs ONLY in `knoe-dev-0`.** Do NOT deploy Garage to `knoe-cnpg-0`.
|
||||
**Garage runs ONLY in `knoe-dev-0`.** The DB cluster (`knoe-dev-cnpg-0`) has none — was removed 2026-04-29. Do NOT redeploy Garage to the DB cluster (use GCS for backups there).
|
||||
|
||||
### CNPG backups → GCS (not Garage)
|
||||
### CNPG backups → GCS
|
||||
|
||||
Backups use **GCS with Workload Identity** (not Garage):
|
||||
- Data bucket: `gs://knoe-0-backups/`
|
||||
- WAL bucket: `gs://knoe-0-wal/`
|
||||
- GCP SA: `cnpg-backup@plenary-truck-485623-p7.iam.gserviceaccount.com`
|
||||
- K8s SA: `cnpg-backup-sa` in `knoe-db-0` (annotated with WI)
|
||||
- ObjectStore manifest: `k8s/knoe/knoe-db-barman-objectstore-gcs.yaml`
|
||||
Backups use **GCS with Workload Identity**:
|
||||
- Data + WAL: `gs://knoe-0-backups/` (single bucket; `knoe-db/base/` and `knoe-db/wals/` prefixes). `gs://knoe-0-wal/` exists but is unused.
|
||||
- GCP SA: `cnpg-backup@plenary-truck-485623-p7.iam.gserviceaccount.com` (roles on bucket: `storage.objectAdmin`, `storage.legacyBucketReader`)
|
||||
- K8s SA: cluster pods run as **`cnpg-backup-sa`** in `knoe-db-0` (set via `cluster.spec.serviceAccountName`, requires CNPG ≥ v1.29.0). The SA is annotated with `iam.gke.io/gcp-service-account=cnpg-backup@…`. Two `RoleBinding` subjects (`knoe-db` and `knoe-db-barman-cloud`) include `cnpg-backup-sa` so the pod has the same RBAC the auto-generated SA would have had.
|
||||
- ObjectStore manifest: [`k8s/knoe/knoe-db-barman-objectstore-gcs.yaml`](k8s/knoe/knoe-db-barman-objectstore-gcs.yaml) — includes `googleCredentials.gkeEnvironment: true` (required by plugin-barman-cloud v0.12.0).
|
||||
|
||||
Setup script: [`etc/init_cnpg_gke.sh`](etc/init_cnpg_gke.sh) (creates buckets, GCP SA, WI binding, applies CNPG cluster).
|
||||
|
||||
Setup script: `etc/init_cnpg_gke.sh` (creates buckets, GCP SA, WI binding, applies CNPG cluster).
|
||||
|
||||
---
|
||||
|
||||
@ -89,15 +94,15 @@ Before running `./install.sh` (especially "Initialization Scripts"), confirm the
|
||||
```ini
|
||||
[Inputs]
|
||||
init_cluster.app_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
init_cluster.db_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
init_cluster.db_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
env_setup.APP_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
env_setup.DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
env_setup.DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
|
||||
[Global]
|
||||
KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
APP_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
CNPG_ELIGIBLE_NODES = <comma-separated node names from knoe-cnpg-0>
|
||||
DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
CNPG_ELIGIBLE_NODES = <comma-separated node names from knoe-dev-cnpg-0>
|
||||
```
|
||||
|
||||
### `conf/service/prod.cfg` (unattended deploy — `./deploy.sh`)
|
||||
@ -107,14 +112,14 @@ Same cluster context entries are required here too:
|
||||
```ini
|
||||
[Inputs]
|
||||
init_cluster.app_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
init_cluster.db_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
init_cluster.db_cluster_kubecontext = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
env_setup.APP_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
env_setup.DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
env_setup.DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
|
||||
[Global]
|
||||
KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
APP_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-0
|
||||
DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0
|
||||
DB_CLUSTER_KUBECONTEXT = gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0
|
||||
ARTIFACT_REGISTRY = us-west3-docker.pkg.dev/plenary-truck-485623-p7/knoe-system
|
||||
SERVICE_NAMESPACE = knoe-system
|
||||
REGISTRY_NAMESPACE = knoe-system
|
||||
@ -122,7 +127,20 @@ REGISTRY_NAMESPACE = knoe-system
|
||||
|
||||
**Why these matter:** `Milestone._get_script_env()` (in `knoe/milestone.py`) reads these to set `KUBECONTEXT=app_ctx` for common services and `DB_CLUSTER_KUBECONTEXT=db_ctx` for CNPG ops. Without them, all kubectl calls use the ambient context, which may be the DB cluster.
|
||||
|
||||
Missing `init_cluster.app_cluster_kubecontext` → `_cluster_kubecontext("app")` returns `""` → installer falls back to `Global.KUBECONTEXT` for **both** app and db environments → **Garage deploys to knoe-cnpg-0** (wrong).
|
||||
Missing `init_cluster.app_cluster_kubecontext` → `_cluster_kubecontext("app")` returns `""` → installer falls back to `Global.KUBECONTEXT` for **both** app and db environments → **Garage deploys to knoe-dev-cnpg-0** (wrong).
|
||||
|
||||
> **Env-contamination guard (live):** `deploy.sh` calls
|
||||
> [`etc/preflight_kubecontext.sh`](etc/preflight_kubecontext.sh) and refuses
|
||||
> to proceed when `kubectl config current-context` doesn't match the
|
||||
> `[Global] APP_CLUSTER_KUBECONTEXT` of the active config. `install.sh`
|
||||
> prints the inherited context up-front (mode-aware strict gate is the
|
||||
> Python TUI's responsibility once the welcome screen records a mode).
|
||||
> Bypass with `KNOE_SKIP_KUBECONTEXT_GUARD=true` for deliberate
|
||||
> cross-cluster maintenance. **History:** the guard was filed in response
|
||||
> to the 2026-04-28 14:00 UTC outage — an `install.sh --mode k3d` run with
|
||||
> the shell pointed at GKE replaced the GCS-backed ObjectStore with a
|
||||
> Garage-backed one, then Garage filled up and backups silently failed for
|
||||
> hours. Closes drift R4 / queue item #1.
|
||||
|
||||
> **Env-contamination guard (live):** `deploy.sh` calls
|
||||
> [`etc/preflight_kubecontext.sh`](etc/preflight_kubecontext.sh) and refuses
|
||||
@ -140,7 +158,7 @@ Missing `init_cluster.app_cluster_kubecontext` → `_cluster_kubecontext("app")`
|
||||
### Get current CNPG node names
|
||||
|
||||
```bash
|
||||
kubectl --context=gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0 get nodes -o name
|
||||
kubectl --context=gke_plenary-truck-485623-p7_us-west3_knoe-dev-cnpg-0 get nodes -o name
|
||||
```
|
||||
|
||||
---
|
||||
@ -160,8 +178,8 @@ kubectl --context=gke_plenary-truck-485623-p7_us-west3_knoe-cnpg-0 get nodes -o
|
||||
|
||||
```python
|
||||
DEFAULT_APP_CLUSTER_NAME = "knoe-dev-0"
|
||||
DEFAULT_DB_CLUSTER_NAME = "knoe-cnpg-0" # also: DEFAULT_CNPG_CLUSTER_NAME
|
||||
DEFAULT_APP_CLUSTER_MACHINE_TYPE = "e2-small" # STALE — live app cluster is e2-standard-2
|
||||
DEFAULT_DB_CLUSTER_NAME = "knoe-dev-cnpg-0"
|
||||
DEFAULT_APP_CLUSTER_MACHINE_TYPE = "e2-standard-2"
|
||||
DEFAULT_DB_CLUSTER_MACHINE_TYPE = "e2-standard-2"
|
||||
```
|
||||
|
||||
|
||||
9
Makefile
9
Makefile
@ -16,7 +16,7 @@ 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 install deploy init clean help requirements test pyconv start
|
||||
.PHONY: all knoe build build-auth install deploy init clean help requirements test pyconv start
|
||||
|
||||
all: build
|
||||
|
||||
@ -32,6 +32,7 @@ help:
|
||||
@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)"
|
||||
@ -53,6 +54,12 @@ build:
|
||||
$(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
|
||||
|
||||
@ -11,10 +11,10 @@
|
||||
</parent>
|
||||
|
||||
<groupId>dev.knoe</groupId>
|
||||
<artifactId>authority</artifactId>
|
||||
<artifactId>auth</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>knoe-authority</name>
|
||||
<description>Knoe authentication gateway</description>
|
||||
<name>knoe-auth</name>
|
||||
<description>Knoe authentication service (knoe-auth)</description>
|
||||
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
@ -40,12 +40,7 @@
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- Kerberos/Security dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.security.kerberos</groupId>
|
||||
<artifactId>spring-security-kerberos-client</artifactId>
|
||||
<version>2.0.1</version>
|
||||
</dependency>
|
||||
<!-- Kerberos: implemented directly against JDK GSS-API (org.ietf.jgss.*) and javax.security.auth.*. No external Spring Security Kerberos dep. -->
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt-api</artifactId>
|
||||
@ -99,6 +94,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>knoe-auth</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority;
|
||||
package dev.knoe.auth;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority;
|
||||
package dev.knoe.auth;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
@ -1,7 +1,7 @@
|
||||
package dev.knoe.authority.admin;
|
||||
package dev.knoe.auth.admin;
|
||||
|
||||
import dev.knoe.authority.enroll.InviteService;
|
||||
import dev.knoe.authority.enroll.InviteService.InviteResult;
|
||||
import dev.knoe.auth.enroll.InviteService;
|
||||
import dev.knoe.auth.enroll.InviteService.InviteResult;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.MediaType;
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority.admin;
|
||||
package dev.knoe.auth.admin;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority.config;
|
||||
package dev.knoe.auth.config;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
@ -13,58 +13,9 @@ public class AuthProperties {
|
||||
private String cookieDomain = ".knoe.dev";
|
||||
private Duration sessionTtl = Duration.ofHours(8);
|
||||
private String sessionSecret = "";
|
||||
private String emailDomain = "knoey.com";
|
||||
private String emailDomain = "knoe.dev";
|
||||
private boolean formEnabled = false;
|
||||
private List<String> adminPrincipals = new ArrayList<>();
|
||||
private Oidc oidc = new Oidc();
|
||||
|
||||
public static class Oidc {
|
||||
private boolean enabled = false;
|
||||
private String issuer = "https://api.knoe.dev/auth";
|
||||
private String clientId = "";
|
||||
private String clientSecret = "";
|
||||
private String signingKey = "";
|
||||
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
this.enabled = enabled;
|
||||
}
|
||||
|
||||
public String getIssuer() {
|
||||
return issuer;
|
||||
}
|
||||
|
||||
public void setIssuer(String issuer) {
|
||||
this.issuer = issuer;
|
||||
}
|
||||
|
||||
public String getClientId() {
|
||||
return clientId;
|
||||
}
|
||||
|
||||
public void setClientId(String clientId) {
|
||||
this.clientId = clientId;
|
||||
}
|
||||
|
||||
public String getClientSecret() {
|
||||
return clientSecret;
|
||||
}
|
||||
|
||||
public void setClientSecret(String clientSecret) {
|
||||
this.clientSecret = clientSecret;
|
||||
}
|
||||
|
||||
public String getSigningKey() {
|
||||
return signingKey;
|
||||
}
|
||||
|
||||
public void setSigningKey(String signingKey) {
|
||||
this.signingKey = signingKey;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
@ -129,12 +80,4 @@ public class AuthProperties {
|
||||
public void setAdminPrincipals(List<String> adminPrincipals) {
|
||||
this.adminPrincipals = adminPrincipals;
|
||||
}
|
||||
|
||||
public Oidc getOidc() {
|
||||
return oidc;
|
||||
}
|
||||
|
||||
public void setOidc(Oidc oidc) {
|
||||
this.oidc = oidc;
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority.config;
|
||||
package dev.knoe.auth.config;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority.enroll;
|
||||
package dev.knoe.auth.enroll;
|
||||
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
import org.slf4j.Logger;
|
||||
@ -1,4 +1,4 @@
|
||||
package dev.knoe.authority.enroll;
|
||||
package dev.knoe.auth.enroll;
|
||||
|
||||
import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
|
||||
import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
|
||||
@ -45,10 +45,6 @@ public class GoogleOAuthService {
|
||||
* @param nonce nonce for id_token replay protection
|
||||
*/
|
||||
public String buildAuthorizationUrl(String state, String nonce) {
|
||||
return buildAuthorizationUrl(state, nonce, this.redirectUri);
|
||||
}
|
||||
|
||||
public String buildAuthorizationUrl(String state, String nonce, String redirectUri) {
|
||||
return UriComponentsBuilder.fromHttpUrl(AUTH_ENDPOINT)
|
||||
.queryParam("client_id", clientId)
|
||||
.queryParam("redirect_uri", redirectUri)
|
||||
@ -71,10 +67,6 @@ public class GoogleOAuthService {
|
||||
* @throws GoogleOAuthException on any error
|
||||
*/
|
||||
public GoogleIdentity exchangeCode(String code) {
|
||||
return exchangeCode(code, this.redirectUri);
|
||||
}
|
||||
|
||||
public GoogleIdentity exchangeCode(String code, String redirectUri) {
|
||||
if (clientId == null || clientId.isBlank()) {
|
||||
throw new GoogleOAuthException("Google OAuth2 is not configured (GOOGLE_CLIENT_ID not set)");
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user