Merge pull request #2883 from manics/update-chart-cryptnono

Update cryptnono chart
jupyterhub · Jan 8, 2024 · 960e86d · 960e86d
2 parents dd47839 + 280f41a
commit 960e86d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/config/curvenote.yaml b/config/curvenote.yaml
@@ -199,10 +199,6 @@ 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
@@ -91,13 +91,6 @@ 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/Chart.yaml b/mybinder/Chart.yaml
@@ -40,7 +40,7 @@ dependencies:
   # cryptnono, counters crypto mining
   # Source code: https://github.com/yuvipanda/cryptnono/
   - name: cryptnono
-    version: "0.3.1-0.dev.git.122.h7fa8a84"
+    version: "0.3.1-0.dev.git.124.ha9d46de"
     repository: https://yuvipanda.github.io/cryptnono/
     condition: cryptnono.enabled
 

diff --git a/mybinder/values.yaml b/mybinder/values.yaml
@@ -6,9 +6,9 @@ cryptnono:
       metrics:
         enabled: true
       # 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
+      # Override if K8s uses a different path for containerd
+      containerdHostPath: /run/containerd/containerd.sock
+      dockerHostPath: /run/dind/docker.sock
 
 imagePullSecrets: