fix(trident): stop searching binaries in /host

Signed-off-by: Clément Nussbaumer <[email protected]>
postfinance · Oct 25, 2024 · 426ce9c · 426ce9c
1 parent e8abb85
commit 426ce9c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.github/workflows/trident.yaml b/.github/workflows/trident.yaml
@@ -30,6 +30,10 @@ jobs:
         working-directory: trident-distrowith/trident
         run: patch Dockerfile ../dockerfile.patch
 
+      - name: Patch chwrap.go to stop searching binaries in /host
+        working-directory: trident-distrowith/trident
+        run: patch chwrap/chwrap.go ../chwrap.patch
+
       - name: Patch Makefile to change default registry for images
         working-directory: trident-distrowith/trident
         run: patch Makefile ../makefile.patch

diff --git a/trident-distrowith/chwrap.patch b/trident-distrowith/chwrap.patch
@@ -0,0 +1,11 @@
+--- trident/chwrap/chwrap.go.original	2024-10-25 07:59:25
++++ trident/chwrap/chwrap.go	2024-10-25 08:01:27
+@@ -53,7 +53,7 @@
+ }
+
+ func main() {
+-	rootPath := "/host"
++	rootPath := "/" // Oct. 24, Clément Nussbaumer: for talos we only consider binaries in the base image, not the host
+ 	// First modify argv0 to strip off any absolute or relative paths
+ 	argv := os.Args
+ 	binary := argv[0]