From 7ee31a185243ee6da13dcd26a592c585b64c80e5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 20 Oct 2024 21:27:52 -0400
Subject: [PATCH] Only launch ssh agent if ssh keys are mounted in tekton.

---
 .../0.1/buildkit-rootless-daemonless.yaml              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml b/task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
index e6dcff9..27e342e 100644
--- a/task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+++ b/task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
@@ -77,9 +77,13 @@ spec:
         #!/usr/bin/env sh
         #
         set -euo pipefail
-        eval \$(ssh-agent)
-        ssh-add /tekton/creds/.ssh/id_*
-        exec buildctl-daemonless.sh build --ssh default=\$SSH_AUTH_SOCK "\${@}"
+        if [ -n "\$(find /tekton/creds/.ssh -maxdepth 1 -name 'id_*' -print -quit)" ]; then
+            eval \$(ssh-agent)
+            ssh-add /tekton/creds/.ssh/id_*
+            exec buildctl-daemonless.sh build --ssh default=\$SSH_AUTH_SOCK "\${@}"
+        else
+            exec buildctl-daemonless.sh build "\${@}"
+        fi
         EOF
         chmod +x /home/user/.config/buildkit/entrypoint.sh
       volumeMounts: