Skip to content

Commit

Permalink
chore: drop rexec in pid 1 namespace for zpool-import
Browse files Browse the repository at this point in the history
We can now drop the rexec of `zpool-importer` in PID 1 namesapce since
Talos now allows setting rootfs mount propagation.

Signed-off-by: Noel Georgi <[email protected]>
  • Loading branch information
frezbo committed Nov 15, 2023
1 parent 2859c23 commit f990683
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 1,937 deletions.
1 change: 0 additions & 1 deletion go.work
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ use (
./nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper
./nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper
./storage/iscsi-tools/iscsid-wrapper
./storage/zfs/zpool-importer
)
2 changes: 1 addition & 1 deletion storage/zfs/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ metadata:
This system extension provides kernel module driver for ZFS built against a specific Talos version.
compatibility:
talos:
version: ">= v1.5.0"
version: ">= v1.6.0"
1 change: 0 additions & 1 deletion storage/zfs/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- stage: libtirpc-zfs
- stage: zlib-zfs
- stage: zfs-tools
- stage: zpool-import-wrapper
steps:
- prepare:
- |
Expand Down
27 changes: 26 additions & 1 deletion storage/zfs/zpool-importer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ depends:
- service: cri
- path: /dev/zfs
container:
entrypoint: /usr/local/sbin/zpool-importer
security:
rootfsPropagation: shared
entrypoint: /usr/local/sbin/zpool
args:
- import
- -fa
mounts:
# ld-musl-x86_64.so.1
- source: /lib
Expand All @@ -20,17 +25,37 @@ container:
options:
- bind
- ro
- source: /usr/local/lib
destination: /usr/local/lib
type: bind
options:
- bind
- ro
- source: /usr/local/sbin
destination: /usr/local/sbin
type: bind
options:
- bind
- ro
- source: /dev
destination: /dev
type: bind
options:
- rshared
- rbind
- rw
- source: /proc
destination: /proc
type: bind
options:
- rshared
- rbind
- rw
- source: /var
destination: /var
type: bind
options:
- rshared
- rbind
- rw
restart: untilSuccess
5 changes: 0 additions & 5 deletions storage/zfs/zpool-importer/go.mod

This file was deleted.

1,863 changes: 0 additions & 1,863 deletions storage/zfs/zpool-importer/go.sum

This file was deleted.

44 changes: 0 additions & 44 deletions storage/zfs/zpool-importer/main.go

This file was deleted.

21 changes: 0 additions & 21 deletions storage/zfs/zpool-importer/pkg.yaml

This file was deleted.

0 comments on commit f990683

Please sign in to comment.