From ce796b7dbde03bbeb2e94c12b700d5753b5c122f Mon Sep 17 00:00:00 2001
From: Jeremy Eder <jeder@redhat.com>
Date: Tue, 24 Feb 2026 22:00:19 -0500
Subject: [PATCH] fix: move OpenShift Route out of kustomize base into overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ambient-api-server Route (route.openshift.io/v1) was in the base
kustomization, which is inherited by all overlays including kind and
e2e. Since kind clusters don't have the Route CRD, kubectl apply fails
and aborts the entire make kind-up pipeline — preventing MinIO bucket
initialization, token extraction, and other post-deploy steps from
running.

Move the Route resource into the production and local-dev overlays
where OpenShift CRDs are available. The base file is kept for
reference but no longer included in the base kustomization.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 components/manifests/base/kustomization.yaml    |  2 --
 .../local-dev/ambient-api-server-route.yaml     | 17 +++++++++++++++++
 .../overlays/local-dev/kustomization.yaml       |  1 +
 .../production/ambient-api-server-route.yaml    | 17 +++++++++++++++++
 .../overlays/production/kustomization.yaml      |  1 +
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 components/manifests/overlays/local-dev/ambient-api-server-route.yaml
 create mode 100644 components/manifests/overlays/production/ambient-api-server-route.yaml

diff --git a/components/manifests/base/kustomization.yaml b/components/manifests/base/kustomization.yaml
index f8afc47ef..6d66bc732 100644
--- a/components/manifests/base/kustomization.yaml
+++ b/components/manifests/base/kustomization.yaml
@@ -19,7 +19,6 @@ resources:
 - ambient-api-server-secrets.yml
 - ambient-api-server-db.yml
 - ambient-api-server-service.yml
-- ambient-api-server-route.yml
 - unleash-deployment.yaml
 
 # Default images (can be overridden by overlays)
@@ -38,4 +37,3 @@ images:
   newTag: latest
 - name: quay.io/ambient_code/vteam_api_server
   newTag: latest
-
diff --git a/components/manifests/overlays/local-dev/ambient-api-server-route.yaml b/components/manifests/overlays/local-dev/ambient-api-server-route.yaml
new file mode 100644
index 000000000..b273e5f0f
--- /dev/null
+++ b/components/manifests/overlays/local-dev/ambient-api-server-route.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: ambient-api-server
+  labels:
+    app: ambient-api-server
+    component: api
+spec:
+  to:
+    kind: Service
+    name: ambient-api-server
+  port:
+    targetPort: api
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
diff --git a/components/manifests/overlays/local-dev/kustomization.yaml b/components/manifests/overlays/local-dev/kustomization.yaml
index 2cfac84f6..10e488f7e 100644
--- a/components/manifests/overlays/local-dev/kustomization.yaml
+++ b/components/manifests/overlays/local-dev/kustomization.yaml
@@ -6,6 +6,7 @@ namespace: vteam-dev
 # Resources (base + local-dev-specific)
 resources:
 - ../../base
+- ambient-api-server-route.yaml
 - build-configs.yaml
 - dev-users.yaml
 - frontend-auth.yaml
diff --git a/components/manifests/overlays/production/ambient-api-server-route.yaml b/components/manifests/overlays/production/ambient-api-server-route.yaml
new file mode 100644
index 000000000..b273e5f0f
--- /dev/null
+++ b/components/manifests/overlays/production/ambient-api-server-route.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: ambient-api-server
+  labels:
+    app: ambient-api-server
+    component: api
+spec:
+  to:
+    kind: Service
+    name: ambient-api-server
+  port:
+    targetPort: api
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
diff --git a/components/manifests/overlays/production/kustomization.yaml b/components/manifests/overlays/production/kustomization.yaml
index a21137659..f375a00c7 100644
--- a/components/manifests/overlays/production/kustomization.yaml
+++ b/components/manifests/overlays/production/kustomization.yaml
@@ -12,6 +12,7 @@ namespace: ambient-code
 # Manage this secret separately: oc apply -f github-app-secret.yaml -n ambient-code
 resources:
 - ../../base
+- ambient-api-server-route.yaml
 - route.yaml
 - backend-route.yaml
 - public-api-route.yaml