use hermes stock image for platform engineer

platform-engineer/build-and-push.sh

@@ -1,24 +1,43 @@
 #!/usr/bin/env bash
-# Build & push the derived Hermes image (kubectl + helm) to the Gitea registry.
+# Build & push the derived Hermes image (kubectl + helm).
 #
-# Run this on a machine with docker + access to git.rogi.casa:
-#   ./platform-engineer/build-and-push.sh
+# Two modes:
+#   ./build-and-push.sh push    # build + push to the Gitea registry
+#   ./build-and-push.sh local   # build + import directly into the NUC's k3s containerd
+#                               # (no registry needed; pod is pinned to this node)
 #
-# Prereqs:
-#   - docker login git.rogi.casa  (use your Gitea username + access token)
+# Default (no arg): push.
 set -euo pipefail
 
-REGISTRY="git.rogi.casa"
+# Docker registry pushes can't go through the Cloudflare proxy (100 MB cap),
+# so push to the DNS-only registry hostname instead of git.rogi.casa.
+# Override with: REGISTRY=git.rogi.casa ./build-and-push.sh push   (if grey-clouded)
+REGISTRY="${REGISTRY:-registry.rogi.casa}"
 REPO="roger/hermes-agent"
 TAG="${TAG:-v1.35-1}"
 IMAGE="${REGISTRY}/${REPO}:${TAG}"
+MODE="${1:-push}"
 
 cd "$(dirname "$0")"
 
 echo "==> Building ${IMAGE}"
 docker build --platform linux/amd64 -t "${IMAGE}" -f dockerfile .
 
-echo "==> Pushing ${IMAGE}"
-docker push "${IMAGE}"
-
-echo "==> Done. Update platform-engineer/deployment.yaml image: if you changed TAG."
+case "$MODE" in
+  push)
+    echo "==> Pushing ${IMAGE}"
+    docker push "${IMAGE}"
+    echo "==> Done. If the pod can't pull, create the gitea-registry secret in the namespace."
+    ;;
+  local)
+    # Requires k3s + being run on the node the pod schedules to (roger-nucbox-evo-x2).
+    echo "==> Importing into k3s containerd (requires sudo)"
+    docker save "${IMAGE}" | sudo k3s ctr images import -
+    echo "==> Done. Verify: sudo k3s ctr images ls | grep hermes-agent"
+    echo "    deployment.yaml is set to imagePullPolicy: IfNotPresent"
+    ;;
+  *)
+    echo "Usage: $0 {push|local}" >&2
+    exit 1
+    ;;
+esac

platform-engineer/deployment.yaml

@@ -18,8 +18,7 @@ spec:
         app: hermes
     spec:
       serviceAccountName: platform-engineer
-      imagePullSecrets:
-      - name: gitea-registry
+      # No imagePullSecrets — using the public stock Hermes image from Docker Hub.
 
       # Pin to the powerful amd64 node (image is linux/amd64; the NUC has 24 GiB).
       nodeSelector:
@@ -43,6 +42,28 @@ spec:
               topologyKey: kubernetes.io/hostname
 
       initContainers:
+      # Download kubectl + helm into a shared emptyDir so the stock Hermes image
+      # (which doesn't ship kubectl) can still drive the cluster. Avoids building
+      # and pushing a custom image through a slow / size-capped registry.
+      - name: install-tools
+        image: curlimages/curl:8.12.1
+        command: ["sh", "-c"]
+        args:
+        - |
+          set -e
+          echo "Downloading kubectl v1.35.0..."
+          curl -fsSL -o /tools/kubectl \
+            https://dl.k8s.io/release/v1.35.0/bin/linux/amd64/kubectl
+          chmod +x /tools/kubectl
+          echo "Downloading helm v3.16.3..."
+          curl -fsSL https://get.helm.sh/helm-v3.16.3-linux-amd64.tar.gz \
+            | tar -xz -C /tools --strip-components=1 linux-amd64/helm
+          chmod +x /tools/helm
+          echo "Tools installed:"; ls -la /tools
+        volumeMounts:
+        - name: tools
+          mountPath: /tools
+
       # Seed /opt/data with config.yaml + SOUL.md on first boot only.
       # ArgoCD owns the manifests; the PVC is runtime state and is NOT reconciled.
       - name: seed-data
@@ -68,9 +89,13 @@ spec:
 
       containers:
       - name: hermes
-        image: git.rogi.casa/roger/hermes-agent:v1.35-1
+        image: nousresearch/hermes-agent:latest
         imagePullPolicy: Always
-        command: ["gateway", "run"]
+        # IMPORTANT: do NOT set `command:` — it would override the image's
+        # ENTRYPOINT (/init, s6-overlay), which sets up the hermes user, seeds
+        # config on first boot, and supervises the gateway. The image's CMD
+        # (main-wrapper.sh) already routes `gateway run` through s6.
+        args: ["gateway", "run"]
         ports:
         - name: gateway
           containerPort: 8642
@@ -80,14 +105,21 @@ spec:
         - secretRef:
             name: hermes-env
         env:
-        # k3s injects these automatically; kubectl inside the pod uses the SA token.
+        # k3s injects KUBERNETES_SERVICE_HOST/PORT + the SA token automatically;
+        # kubectl inside the pod authenticates as the platform-engineer SA.
         - name: HERMES_HOME
           value: /opt/data
+        # Put the initContainer-installed kubectl/helm on PATH for the hermes user.
+        - name: PATH
+          value: /opt/hermes/bin:/opt/hermes/.venv/bin:/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
         volumeMounts:
         - name: data
           mountPath: /opt/data
         - name: workspace
           mountPath: /workspace
+        - name: tools
+          mountPath: /tools
+          readOnly: true
         resources:
           requests:
             memory: "512Mi"
@@ -104,7 +136,6 @@ spec:
           failureThreshold: 3
         securityContext:
           allowPrivilegeEscalation: false
-          runAsNonRoot: false   # official image runs as root for s6 init then drops to hermes
 
       volumes:
       - name: data
@@ -112,6 +143,8 @@ spec:
           claimName: hermes-data
       - name: workspace
         emptyDir: {}
+      - name: tools
+        emptyDir: {}
       - name: seed
         configMap:
           name: hermes-seed