From 24a97cac4b0c28da6856a1758ed9a0c7d7576b1c Mon Sep 17 00:00:00 2001
From: kaiyou <dev@kaiyou.fr>
Date: Tue, 17 Oct 2023 17:44:52 +0200
Subject: [PATCH] Fix binary path for kubelet to spawn new containers
---
cmd/hepto/hepto.go | 4 +++-
go.mod | 2 +-
go.sum | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cmd/hepto/hepto.go b/cmd/hepto/hepto.go
index 999b9e3..1b6a6cf 100644
--- a/cmd/hepto/hepto.go
+++ b/cmd/hepto/hepto.go
@@ -41,7 +41,9 @@ func Hepto() error {
&config.Iface,
dolly.NewSystem(desiredModules, systemSettings),
dolly.NewBind(dataPath, config.Cluster.DataDir),
- dolly.MountSelf("/bin", "runc", "mount", "umount"),
+ dolly.PrefixEnv("HEPTO_"),
+ dolly.NewEnv("PATH", "/bin"),
+ dolly.MountSelf("/bin", "runc", "containerd-shim-runc-v2", "mount", "umount"),
dolly.NewDevicesOrPanic(requiredDevices...),
dolly.NewBinds(config.Mounts),
)
diff --git a/go.mod b/go.mod
index 570efe9..be79c51 100644
--- a/go.mod
+++ b/go.mod
@@ -60,7 +60,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/vishvananda/netlink v1.2.1-beta.2
go.acides.org/daeman v0.3.4
- go.acides.org/dolly v0.4.2
+ go.acides.org/dolly v0.4.4
go.acides.org/pekahi v0.2.1
go.acides.org/sml v0.2.2
go.etcd.io/etcd/server/v3 v3.5.9
diff --git a/go.sum b/go.sum
index 0b56f01..df9e3e8 100644
--- a/go.sum
+++ b/go.sum
@@ -1144,6 +1144,10 @@ go.acides.org/daeman v0.3.4 h1:gjKq95TpP2+IMUkW/u1do4J43Y6KhTOPwOg6BBCBT74=
go.acides.org/daeman v0.3.4/go.mod h1:fOZ4YudsVjbUan8WYTs0ED6JfpZ7Z6mlN4Lnn1qW5nk=
go.acides.org/dolly v0.4.2 h1:PXlNJrG4fL/OYjllvWr3MPRKe5L1sSetexNtaiWyaqw=
go.acides.org/dolly v0.4.2/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM=
+go.acides.org/dolly v0.4.3 h1:ktLkz8ITgtgMuyoFScJnFBUhLWbpFlNc1Cei7EhPbxE=
+go.acides.org/dolly v0.4.3/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM=
+go.acides.org/dolly v0.4.4 h1:TnJytd1OXZ5mDT+R0vrZYwoGPHvWP0ec7Gnhp1mQJ54=
+go.acides.org/dolly v0.4.4/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM=
go.acides.org/pekahi v0.2.1 h1:ysmC14q+hnYXcuB1Ew2XoWDZsgR1jbut89ACRLwi43I=
go.acides.org/pekahi v0.2.1/go.mod h1:AxgN7Ss6dCRHoNOVWMymkmDafWYdDV7ce6jPl5bqyRc=
go.acides.org/sml v0.2.2 h1:swwqh/MoYO/7AifuIefhfw2XeVEyXU46Uz+VtDWiDNE=
--
GitLab