From 8e33960f55288b2c94ed030f1d43f3e636a05902 Mon Sep 17 00:00:00 2001 From: Christopher Tineo Date: Thu, 7 May 2026 17:24:58 -0400 Subject: [PATCH 1/4] feat(balancer): point to integrated sandbox overlay with CNPG support - Update balancer source to use integration branch (TineoC/balancer-main#integrate-all-migration) - Change holomapping root from base to overlays/sandbox for CNPG + Gateway API + CORS changes - Depends on CodeForPhilly/balancer-main#507 --- .holo/branches/k8s-manifests/balancer/manifests.toml | 2 +- .holo/sources/balancer.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.holo/branches/k8s-manifests/balancer/manifests.toml b/.holo/branches/k8s-manifests/balancer/manifests.toml index 8e3f3dc..8cb6183 100644 --- a/.holo/branches/k8s-manifests/balancer/manifests.toml +++ b/.holo/branches/k8s-manifests/balancer/manifests.toml @@ -1,4 +1,4 @@ [holomapping] holosource = "balancer" -root = "deploy/manifests/balancer/base" +root = "deploy/manifests/balancer/overlays/sandbox" files = "**" diff --git a/.holo/sources/balancer.toml b/.holo/sources/balancer.toml index e0c6690..1257e70 100644 --- a/.holo/sources/balancer.toml +++ b/.holo/sources/balancer.toml @@ -1,3 +1,3 @@ [holosource] -url = "https://github.com/CodeForPhilly/balancer-main.git" -ref = "refs/tags/v1.1.3" +url = "https://github.com/TineoC/balancer-main.git" +ref = "refs/heads/integrate-all-migration" From db8105cea3631f4bffc5e06828019f4027319d7f Mon Sep 17 00:00:00 2001 From: Christopher Tineo Date: Thu, 7 May 2026 17:51:14 -0400 Subject: [PATCH 2/4] feat(cnpg): add balancer Database CRD to cloudnative-pg infra Moved from balancer-main base manifests. The Database CRD must be in the same namespace as the Cluster (cloudnative-pg). Kustomize's namespace override in the app overlay was incorrectly placing it in the balancer namespace. --- infra/cloudnative-pg/balancer-database.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 infra/cloudnative-pg/balancer-database.yaml diff --git a/infra/cloudnative-pg/balancer-database.yaml b/infra/cloudnative-pg/balancer-database.yaml new file mode 100644 index 0000000..4676c6b --- /dev/null +++ b/infra/cloudnative-pg/balancer-database.yaml @@ -0,0 +1,10 @@ +apiVersion: postgresql.cnpg.io/v1 +kind: Database +metadata: + name: balancer + namespace: cloudnative-pg +spec: + name: balancer + owner: balancer + cluster: + name: shared-cluster From 40363c6844dbe26735249bd61e786036ee52f1d7 Mon Sep 17 00:00:00 2001 From: Christopher Tineo Date: Thu, 7 May 2026 17:58:19 -0400 Subject: [PATCH 3/4] fix: update balancer kustomize lens root to sandbox overlay path - Remove balancer-database.yaml from infra (now in balancer-main sandbox overlay) - Update lens root from 'balancer' to 'balancer/manifests/overlays/sandbox' so kustomize build finds the correct kustomization.yaml --- .holo/lenses/balancer.toml | 2 +- infra/cloudnative-pg/balancer-database.yaml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 infra/cloudnative-pg/balancer-database.yaml diff --git a/.holo/lenses/balancer.toml b/.holo/lenses/balancer.toml index 6fadb97..df23047 100644 --- a/.holo/lenses/balancer.toml +++ b/.holo/lenses/balancer.toml @@ -2,7 +2,7 @@ container = "ghcr.io/hologit/lenses/kustomize:latest" [hololens.input] -root = "balancer" +root = "balancer/manifests/overlays/sandbox" files = "**" [hololens.output] diff --git a/infra/cloudnative-pg/balancer-database.yaml b/infra/cloudnative-pg/balancer-database.yaml deleted file mode 100644 index 4676c6b..0000000 --- a/infra/cloudnative-pg/balancer-database.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: postgresql.cnpg.io/v1 -kind: Database -metadata: - name: balancer - namespace: cloudnative-pg -spec: - name: balancer - owner: balancer - cluster: - name: shared-cluster From 4641f482f97749e9150df10cd707b6f3a3ecff05 Mon Sep 17 00:00:00 2001 From: Christopher Tineo Date: Thu, 7 May 2026 18:05:30 -0400 Subject: [PATCH 4/4] fix: track develop branch and add CNPG kustomize lens - Update balancer source to track CodeForPhilly/balancer-main develop branch - Add balancer-cnpg.toml lens for the CNPG Database kustomization (separate lens needed because kustomize namespace override prevents including it as a resource in the main overlay) Depends on CodeForPhilly/balancer-main#507 merging into develop. --- .holo/lenses/balancer-cnpg.toml | 9 +++++++++ .holo/sources/balancer.toml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .holo/lenses/balancer-cnpg.toml diff --git a/.holo/lenses/balancer-cnpg.toml b/.holo/lenses/balancer-cnpg.toml new file mode 100644 index 0000000..d0248ef --- /dev/null +++ b/.holo/lenses/balancer-cnpg.toml @@ -0,0 +1,9 @@ +[hololens] +container = "ghcr.io/hologit/lenses/kustomize:latest" + +[hololens.input] +root = "balancer/manifests/overlays/sandbox/cnpg" +files = "**" + +[hololens.output] +merge = "replace" diff --git a/.holo/sources/balancer.toml b/.holo/sources/balancer.toml index 1257e70..bc8533d 100644 --- a/.holo/sources/balancer.toml +++ b/.holo/sources/balancer.toml @@ -1,3 +1,3 @@ [holosource] -url = "https://github.com/TineoC/balancer-main.git" -ref = "refs/heads/integrate-all-migration" +url = "https://github.com/CodeForPhilly/balancer-main.git" +ref = "refs/heads/develop"