r

Author: JoseSzycho

.github/workflows/build-apiserver.yaml

@@ -46,8 +46,6 @@ jobs:
     with:
       bundle-name: ghcr.io/datum-cloud/search-kustomize
       bundle-path: config
-      image-overlays: |
-        config/base
-        config/core-control-plane
+      image-overlays: config/base
       image-name: ghcr.io/datum-cloud/search
     secrets: inherit

config/core-control-plane/kustomization.yaml

@@ -1,17 +1,20 @@
 # This overlay aggregates all search components for deployment into the core
-# control plane. It includes the apiserver, resource-indexer, and the
-# controller-manager with its core-control-plane RBAC overlay.
+# control plane. It includes the full base (apiserver, controller-manager,
+# resource-indexer) and layers on the controller-manager RBAC overlay that is
+# specific to the core control plane.
 #
-# The images block at this level ensures that the CI-injected image tag
-# cascades down to all sub-components.
+# The images block from ../base cascades down to all sub-components, so CI
+# only needs to inject the tag into config/base.
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../base/apiserver
-  - ../overlays/controller-manager/core-control-plane
-  - ../base/resource-indexer
+  # The base aggregates apiserver, controller-manager, and resource-indexer.
+  # Its images: block (injected by CI) cascades the correct tag to all.
+  - ../base
+  # Add the RBAC resources specific to the core control plane.
+  - ../overlays/controller-manager/core-control-plane/rbac
 
-images:
-  - name: ghcr.io/datum-cloud/search
-    newTag: latest
+patches:
+  # Apply the controller-manager deployment patch from the overlay.
+  - path: ../overlays/controller-manager/core-control-plane/patches/deployment.yaml