From 335dd1366d099899d1e8ec0af87338c4791faad6 Mon Sep 17 00:00:00 2001 From: Sten Date: Mon, 1 Jun 2026 12:26:07 +0200 Subject: [PATCH] refactor(apps): move forte-drop apps from base to upc-dev overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit forte-drop, forte-drop-mcp and forte-drop-postgresql lived under apps/base/ but were only ever wired into the upc-dev overlay (never listed in apps/base/kustomization.yaml). They carry hackathon-domain hardcoded values and must not sync to upc-prod, so they belong in the overlay alongside dbunk-demo — per danijel.simeunovic's review on PR #18. - git mv the three dirs into apps/overlays/upc-dev/ (history preserved) - rewrite overlay kustomization refs from ../../base/forte-drop* to local - repoint forte-drop-postgresql Application path apps/base/... -> apps/overlays/upc-dev/forte-drop-postgresql/resources Render-verified: kubectl kustomize apps/overlays/upc-dev differs only by the postgres path line; apps/overlays/upc-prod render byte-identical (forte-drop never reaches prod). Co-Authored-By: Claude Opus 4.8 --- .../upc-dev}/forte-drop-mcp/forte-drop-mcp.yaml | 0 .../upc-dev}/forte-drop-mcp/kustomization.yaml | 0 .../upc-dev}/forte-drop-postgresql/RESTORE.md | 0 .../forte-drop-postgresql.yaml | 2 +- .../forte-drop-postgresql/kustomization.yaml | 0 .../resources/forte-drop-pg-creds-sealed.yaml | 0 .../resources/kustomization.yaml | 0 .../resources/pg-backup-cronjob.yaml | 0 .../resources/postgresql.yaml | 0 .../upc-dev}/forte-drop/forte-drop-pdb.yaml | 0 .../forte-drop/forte-drop-secrets-sealed.yaml | 0 .../upc-dev}/forte-drop/forte-drop.yaml | 0 .../forte-drop/keycloak-client-forte-drop.yaml | 0 .../upc-dev}/forte-drop/kustomization.yaml | 0 .../upc-dev}/forte-drop/namespace.yaml | 0 apps/overlays/upc-dev/kustomization.yaml | 15 ++++++++------- 16 files changed, 9 insertions(+), 8 deletions(-) rename apps/{base => overlays/upc-dev}/forte-drop-mcp/forte-drop-mcp.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-mcp/kustomization.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/RESTORE.md (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/forte-drop-postgresql.yaml (93%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/kustomization.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/resources/kustomization.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/resources/pg-backup-cronjob.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop-postgresql/resources/postgresql.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/forte-drop-pdb.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/forte-drop-secrets-sealed.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/forte-drop.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/keycloak-client-forte-drop.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/kustomization.yaml (100%) rename apps/{base => overlays/upc-dev}/forte-drop/namespace.yaml (100%) diff --git a/apps/base/forte-drop-mcp/forte-drop-mcp.yaml b/apps/overlays/upc-dev/forte-drop-mcp/forte-drop-mcp.yaml similarity index 100% rename from apps/base/forte-drop-mcp/forte-drop-mcp.yaml rename to apps/overlays/upc-dev/forte-drop-mcp/forte-drop-mcp.yaml diff --git a/apps/base/forte-drop-mcp/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-mcp/kustomization.yaml similarity index 100% rename from apps/base/forte-drop-mcp/kustomization.yaml rename to apps/overlays/upc-dev/forte-drop-mcp/kustomization.yaml diff --git a/apps/base/forte-drop-postgresql/RESTORE.md b/apps/overlays/upc-dev/forte-drop-postgresql/RESTORE.md similarity index 100% rename from apps/base/forte-drop-postgresql/RESTORE.md rename to apps/overlays/upc-dev/forte-drop-postgresql/RESTORE.md diff --git a/apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml similarity index 93% rename from apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml index 313fc0c..309639b 100644 --- a/apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml +++ b/apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml @@ -17,7 +17,7 @@ spec: source: repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git targetRevision: HEAD - path: apps/base/forte-drop-postgresql/resources + path: apps/overlays/upc-dev/forte-drop-postgresql/resources destination: server: https://kubernetes.default.svc diff --git a/apps/base/forte-drop-postgresql/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/kustomization.yaml similarity index 100% rename from apps/base/forte-drop-postgresql/kustomization.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/kustomization.yaml diff --git a/apps/base/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml similarity index 100% rename from apps/base/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml diff --git a/apps/base/forte-drop-postgresql/resources/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/kustomization.yaml similarity index 100% rename from apps/base/forte-drop-postgresql/resources/kustomization.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/kustomization.yaml diff --git a/apps/base/forte-drop-postgresql/resources/pg-backup-cronjob.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/pg-backup-cronjob.yaml similarity index 100% rename from apps/base/forte-drop-postgresql/resources/pg-backup-cronjob.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/pg-backup-cronjob.yaml diff --git a/apps/base/forte-drop-postgresql/resources/postgresql.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/postgresql.yaml similarity index 100% rename from apps/base/forte-drop-postgresql/resources/postgresql.yaml rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/postgresql.yaml diff --git a/apps/base/forte-drop/forte-drop-pdb.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop-pdb.yaml similarity index 100% rename from apps/base/forte-drop/forte-drop-pdb.yaml rename to apps/overlays/upc-dev/forte-drop/forte-drop-pdb.yaml diff --git a/apps/base/forte-drop/forte-drop-secrets-sealed.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop-secrets-sealed.yaml similarity index 100% rename from apps/base/forte-drop/forte-drop-secrets-sealed.yaml rename to apps/overlays/upc-dev/forte-drop/forte-drop-secrets-sealed.yaml diff --git a/apps/base/forte-drop/forte-drop.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop.yaml similarity index 100% rename from apps/base/forte-drop/forte-drop.yaml rename to apps/overlays/upc-dev/forte-drop/forte-drop.yaml diff --git a/apps/base/forte-drop/keycloak-client-forte-drop.yaml b/apps/overlays/upc-dev/forte-drop/keycloak-client-forte-drop.yaml similarity index 100% rename from apps/base/forte-drop/keycloak-client-forte-drop.yaml rename to apps/overlays/upc-dev/forte-drop/keycloak-client-forte-drop.yaml diff --git a/apps/base/forte-drop/kustomization.yaml b/apps/overlays/upc-dev/forte-drop/kustomization.yaml similarity index 100% rename from apps/base/forte-drop/kustomization.yaml rename to apps/overlays/upc-dev/forte-drop/kustomization.yaml diff --git a/apps/base/forte-drop/namespace.yaml b/apps/overlays/upc-dev/forte-drop/namespace.yaml similarity index 100% rename from apps/base/forte-drop/namespace.yaml rename to apps/overlays/upc-dev/forte-drop/namespace.yaml diff --git a/apps/overlays/upc-dev/kustomization.yaml b/apps/overlays/upc-dev/kustomization.yaml index 9b92f0f..11abf6f 100644 --- a/apps/overlays/upc-dev/kustomization.yaml +++ b/apps/overlays/upc-dev/kustomization.yaml @@ -2,12 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../base -- ../../base/forte-drop-postgresql -- ../../base/forte-drop -- ../../base/forte-drop-mcp +- forte-drop-postgresql +- forte-drop +- forte-drop-mcp - dbunk-demo -# No patches needed — base already has "upc-dev" paths -# upc-dev is the default/base cluster -# forte-drop and forte-drop-mcp are scoped to upc-dev only — they have -# hackathon-domain hardcoded values and must not sync to upc-prod. +# No patches needed — base apps already default to "upc-dev" value paths +# (upc-dev is the default/base cluster). +# forte-drop (postgres + web + mcp) and dbunk-demo are upc-dev-only apps — they +# have hackathon-domain hardcoded values and must not sync to upc-prod, so they +# live here in the overlay rather than in apps/base/.