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>
100 lines
4.0 KiB
Bash
Executable File
100 lines
4.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# init_grafana_oauth.sh
|
|
#
|
|
# Bootstrap the Google-OAuth secret that kps-grafana mounts as env vars
|
|
# (GF_AUTH_GOOGLE_CLIENT_ID / GF_AUTH_GOOGLE_CLIENT_SECRET) for its native
|
|
# auth.google sign-in flow. Companion to:
|
|
# - deploy/gcp/gke/grafana-google-oidc-secret.example.yaml (envsubst template)
|
|
# - monitoring/kps-values-gke.yaml (Helm overrides for grafana subchart)
|
|
#
|
|
# Auth model:
|
|
# - Anyone in the @knoey.com Workspace can sign in (auth.google.allowed_domains).
|
|
# - chrisfu@knoey.com + ron@knoey.com get Admin (role_attribute_path JMESPath).
|
|
# - Everyone else @knoey.com gets Editor.
|
|
#
|
|
# Usage:
|
|
# ./etc/init_grafana_oauth.sh
|
|
#
|
|
# Env vars (resolved from etc/secrets/* if not set in the shell):
|
|
# GRAFANA_GOOGLE_CLIENT_ID ← from etc/secrets/grafana-google-oidc-client-id
|
|
# GRAFANA_GOOGLE_CLIENT_SECRET ← from etc/secrets/grafana-google-oidc-client-secret
|
|
#
|
|
# Optional:
|
|
# APP_CLUSTER_KUBECONTEXT (default: $KUBECONTEXT then ambient)
|
|
# NAMESPACE (default: monitoring)
|
|
#
|
|
# Pre-reqs:
|
|
# - OAuth 2.0 client created at GCP Console (see the secret template
|
|
# deploy/gcp/gke/grafana-google-oidc-secret.example.yaml for the
|
|
# exact authorized redirect URI + consent screen settings).
|
|
# - Two values saved into etc/secrets/grafana-google-oidc-client-{id,secret}
|
|
# (chmod 0600 each; etc/secrets/ is gitignored except for .keep).
|
|
#
|
|
# After this script runs and the Secret is in place, the next `helm upgrade`
|
|
# (or kubectl-apply of the chart's rendered manifest) of kps-grafana picks
|
|
# up the Secret via `envFromSecret: grafana-google-oidc`. Verify with:
|
|
# kubectl --context=$APP_CLUSTER_KUBECONTEXT -n monitoring exec -it kps-grafana-0 -c grafana -- \
|
|
# env | grep GF_AUTH_GOOGLE_
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
GKE_MANIFEST_DIR="$REPO_ROOT/deploy/gcp/gke"
|
|
|
|
NAMESPACE="${NAMESPACE:-monitoring}"
|
|
KCTX="${APP_CLUSTER_KUBECONTEXT:-${KUBECONTEXT:-}}"
|
|
|
|
if [[ -n "$KCTX" ]]; then
|
|
KCTX_FLAG=(--context="$KCTX")
|
|
else
|
|
KCTX_FLAG=()
|
|
fi
|
|
|
|
log() { printf "[%s] %s\n" "$(date +%H:%M:%S)" "$*"; }
|
|
die() { log "ERROR: $*" >&2; exit 1; }
|
|
|
|
resolve_secret() {
|
|
local var="$1" file="$2" val="${!1:-}"
|
|
if [[ -z "$val" && -f "$REPO_ROOT/etc/secrets/$file" ]]; then
|
|
val="$(cat "$REPO_ROOT/etc/secrets/$file")"
|
|
fi
|
|
if [[ -z "$val" ]]; then
|
|
die "missing $var (set the env var, or save the value into etc/secrets/$file)"
|
|
fi
|
|
printf '%s' "$val"
|
|
}
|
|
|
|
for tool in kubectl envsubst; do
|
|
command -v "$tool" >/dev/null 2>&1 || die "required tool not found: $tool"
|
|
done
|
|
|
|
GRAFANA_GOOGLE_CLIENT_ID="$(resolve_secret GRAFANA_GOOGLE_CLIENT_ID grafana-google-oidc-client-id)"
|
|
GRAFANA_GOOGLE_CLIENT_SECRET="$(resolve_secret GRAFANA_GOOGLE_CLIENT_SECRET grafana-google-oidc-client-secret)"
|
|
export GRAFANA_GOOGLE_CLIENT_ID GRAFANA_GOOGLE_CLIENT_SECRET
|
|
|
|
SECRET_TMPL="$GKE_MANIFEST_DIR/grafana-google-oidc-secret.example.yaml"
|
|
[[ -f "$SECRET_TMPL" ]] || die "missing manifest: $SECRET_TMPL"
|
|
|
|
log "==> grafana google-oauth bootstrap"
|
|
log " namespace : $NAMESPACE"
|
|
log " kubectx : ${KCTX:-<ambient>}"
|
|
|
|
log "Applying grafana-google-oidc Secret ..."
|
|
envsubst '${GRAFANA_GOOGLE_CLIENT_ID} ${GRAFANA_GOOGLE_CLIENT_SECRET}' \
|
|
< "$SECRET_TMPL" \
|
|
| kubectl "${KCTX_FLAG[@]}" -n "$NAMESPACE" apply -f -
|
|
|
|
log "==> grafana google-oauth secret applied."
|
|
echo ""
|
|
echo " Next steps:"
|
|
echo " 1. Apply the Helm values override at monitoring/kps-values-gke.yaml:"
|
|
echo " helm upgrade --reuse-values kps prometheus-community/kube-prometheus-stack \\"
|
|
echo " --namespace $NAMESPACE \\"
|
|
echo " -f $REPO_ROOT/monitoring/kps-values-gke.yaml"
|
|
echo " 2. Patch knoe-svc-kong-config to add the /grafana route (see"
|
|
echo " deploy/opentofu/k3s/manifests/knoe/kong-configmap.yaml for the canonical source)."
|
|
echo " 3. Restart Kong: kubectl rollout restart deployment/knoe-svc-kong -n knoe-system"
|
|
echo " 4. Browser-test: https://svc.knoe.dev/grafana → Google sign-in → Grafana"
|
|
echo ""
|