From 263c305c8312127c963b3b776456782d8a582596 Mon Sep 17 00:00:00 2001
From: Simon Li <orpheus+devel@gmail.com>
Date: Thu, 4 Jan 2024 21:13:48 +0000
Subject: [PATCH] Move cryptnono container lookup config into individual
 deployments

It's dependent on whether build and user nodes are combined or separate, since docker is only present on build nodes
---
 config/curvenote.yaml | 4 ++++
 config/ovh2.yaml      | 7 +++++++
 mybinder/values.yaml  | 5 +++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config/curvenote.yaml b/config/curvenote.yaml
index 180f9ab77..4d39a58e8 100644
--- a/config/curvenote.yaml
+++ b/config/curvenote.yaml
@@ -199,6 +199,10 @@ binderhub:
 cryptnono:
   enabled: true
   priorityClassName: binderhub-core
+  detectors:
+    execwhacker:
+      containerdHostPath: /run/containerd
+      dockerHostPath: /run/dind
 
 grafana:
   enabled: false
diff --git a/config/ovh2.yaml b/config/ovh2.yaml
index a3828d393..af61a8e09 100644
--- a/config/ovh2.yaml
+++ b/config/ovh2.yaml
@@ -91,6 +91,13 @@ binderhub:
     imageGCThresholdLow: 30e9
     imageGCThresholdType: "absolute"
 
+cryptnono:
+  detectors:
+    execwhacker:
+      containerdHostPath: /run/containerd
+      # TODO: Currently disabled as isn't present on all nodes, only on nodes running builders
+      # dockerHostPath: /run/dind
+
 grafana:
   nodeSelector: *coreNodeSelector
   ingress:
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index 6382c9605..88a9df920 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -5,8 +5,9 @@ cryptnono:
     execwhacker:
       metrics:
         enabled: true
-      containerdHostPath: /run/containerd
-      # TODO: Currently disabled as isn't present on all nodes, only on nodes running builders
+      # execwhacker needs access to containerd, and docker on build hosts, to lookup the container.
+      # Set these in the configurations for each deployment
+      # containerdHostPath: /run/containerd
       # dockerHostPath: /run/dind
 
 imagePullSecrets: