Revert being explicit about multi-arch, manifest images handle that transparently

Author: omarjatoi

README.md

@@ -27,14 +27,10 @@ kubectl create secret generic nix-builder-ssh-keys \
 
 ### Deploying the Controller and Proxy
 
-Deploy components to the cluster using Kustomize, selecting the appropriate architecture overlay:
+Deploy components to the cluster using Kustomize:
 
 ```sh
-# For ARM64 clusters (e.g., Apple Silicon, AWS Graviton)
-kubectl apply -k deploy/overlays/aarch64
-
-# For x86_64 clusters
-kubectl apply -k deploy/overlays/x86_64
+kubectl apply -k deploy
 ```
 
 ### Configuring Your Nix Client
@@ -169,11 +165,11 @@ Phases: `Pending` → `Creating` → `Running` → `Completed`/`Failed`
 
 ### Customizing Builder Resources
 
-Edit `deploy/base/controller-deployment.yaml` to set default resource requests/limits, or configure them per-build through the CRD spec.
+Edit `deploy/controller-deployment.yaml` to set default resource requests/limits, or configure them per-build through the CRD spec.
 
 ### Customizing Nix Configuration
 
-Edit `deploy/base/nix-config.yaml` to modify the `nix.conf` mounted in builder pods:
+Edit `deploy/nix-config.yaml` to modify the `nix.conf` mounted in builder pods:
 
 ```yaml
 data:

deploy/base/kustomization.yaml

@@ -19,7 +19,7 @@ spec:
           image: controller
           imagePullPolicy: Always
           args:
-            - --builder-image=builder:latest
+            - --builder-image=ghcr.io/omarjatoi/nix-remote-build-controller/builder:latest
             - --remote-port=22
             - --nix-config=nix-builder-config
             - --ssh-key-secret=nix-builder-ssh-keys

deploy/base/controller-deployment.yaml deploy/controller-deployment.yamldeploy/base/controller-deployment.yaml renamed to deploy/controller-deployment.yaml

@@ -2,18 +2,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../base
+  - crd.yaml
+  - rbac.yaml
+  - controller-deployment.yaml
+  - nix-config.yaml
+  - proxy-deployment.yaml
 
-patches:
-  - path: builder-image-patch.yaml
+commonLabels:
+  app.kubernetes.io/name: nix-remote-build-controller
+  app.kubernetes.io/version: latest
 
 images:
   - name: controller
-    newName: ghcr.io/omarjatoi/nix-remote-build-controller/controller-x86_64
+    newName: ghcr.io/omarjatoi/nix-remote-build-controller/controller
     newTag: latest
   - name: proxy
-    newName: ghcr.io/omarjatoi/nix-remote-build-controller/proxy-x86_64
+    newName: ghcr.io/omarjatoi/nix-remote-build-controller/proxy
     newTag: latest
   - name: builder
-    newName: ghcr.io/omarjatoi/nix-remote-build-controller/builder-x86_64
+    newName: ghcr.io/omarjatoi/nix-remote-build-controller/builder
     newTag: latest